r941 - html/trunk/scripts

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Wed Jan 12 16:09:03 PST 2005


Author: lizardo
Date: 2005-01-12 17:09:01 -0700 (Wed, 12 Jan 2005)
New Revision: 941

Modified:
   html/trunk/scripts/rsync-ignore
   html/trunk/scripts/update-website.mk
Log:
Fixed rsync operation.


Modified: html/trunk/scripts/rsync-ignore
===================================================================
--- html/trunk/scripts/rsync-ignore	2005-01-12 23:27:10 UTC (rev 940)
+++ html/trunk/scripts/rsync-ignore	2005-01-13 00:09:01 UTC (rev 941)
@@ -1,8 +1,8 @@
 .svn
-logs
-scripts
-templates
+/logs
+/scripts
+/templates
 news-*.txt
-mirrorlist.html
-403.html
-404.html
+/mirrorlist.html
+/403.html
+/404.html

Modified: html/trunk/scripts/update-website.mk
===================================================================
--- html/trunk/scripts/update-website.mk	2005-01-12 23:27:10 UTC (rev 940)
+++ html/trunk/scripts/update-website.mk	2005-01-13 00:09:01 UTC (rev 941)
@@ -217,6 +217,10 @@
 error-pages: 403.html 404.html
 #	cp {403,404}.html /home/httpd/error
 
+# Copy website content to its final location
+# "$(find -maxdepth 1 -mindepth 1)" excludes WWW_WC itself from the sync,
+# avoiding "Operation not permitted" errors
 run-rsync:
 	test -n "$(TARGETDIR)"
-	rsync -aq --exclude-from=scripts/rsync-ignore $(WWW_WC)/ $(TARGETDIR)/
+	cd $(WWW_WC) && \
+	rsync -aq --exclude-from=scripts/rsync-ignore $$(find -maxdepth 1 -mindepth 1) $(TARGETDIR)/




More information about the website mailing list