From: Fabian Keil <fk@fabiankeil.de>
Date: Tue, 21 Oct 2014 15:31:05 +0000 (+0000)
Subject: Fix web-actions target
X-Git-Tag: v_3_0_22~27
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=e903d10fd3eeb1d16c6d92d0f43c87b9074f4cde

Fix web-actions target
---

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 3ca8bade..f5eaf767 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,6 +1,6 @@
 # Note:  Makefile is built automatically from Makefile.in
 #
-# $Id: GNUmakefile.in,v 1.225 2014/10/21 15:29:46 fabiankeil Exp $
+# $Id: GNUmakefile.in,v 1.226 2014/10/21 15:30:06 fabiankeil Exp $
 #
 # Written by and Copyright (C) 2001-2013 members of the
 # Privoxy team. http://www.privoxy.org/
@@ -634,15 +634,11 @@ webserver: clean-editor-files
 	@$(SSH) shell.sourceforge.net 'chmod -R 775 $(WWW_ROOT)/htdocs 2>/dev/null; true'
 	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/ -type f | xargs chmod 664 2>/dev/null; true'
 
-web-actions: clean-editor-files
-	@$(ECHO) Uploading
-	@cd doc/webserver/actions; \
-          upload=`find . -type f -a -not \( -path "*/CVS*" -o -path "*/results*" \)`; \
-          $(TAR) cf - $$upload | $(SSH) ijbswa.sourceforge.net 'cd $(WWW_ROOT)/htdocs/actions; tar xvm'
-
-	@$(ECHO) Fixing permissions
-	@$(SSH) ijbswa.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
-	@$(SSH) ijbswa.sourceforge.net 'chmod 666 $(WWW_ROOT)/htdocs/actions/results/actions-feedback.txt 2>/dev/null'
+web-actions:
+	@$(ECHO) Updating the actions on the webserver ...
+	@$(RSYNC) doc/webserver/actions/*.php shell.sourceforge.net:$(WWW_ROOT)/htdocs/actions
+	@$(ECHO) Enforcing reasonable permissions ...
+	@$(SSH) shell.sourceforge.net 'find $(WWW_ROOT)/htdocs/actions/ -type f | xargs chmod 664 2>/dev/null'
 
 web-faq:
 	@$(ECHO) Updating the FAQ on the webserver ...