r951 - html/trunk/scripts

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Tue Jan 18 14:46:17 PST 2005


Author: lizardo
Date: 2005-01-18 15:46:14 -0700 (Tue, 18 Jan 2005)
New Revision: 951

Modified:
   html/trunk/scripts/update-website.mk
Log:
Some fixes to update-website.mk and testing rsync's --delete option.


Modified: html/trunk/scripts/update-website.mk
===================================================================
--- html/trunk/scripts/update-website.mk	2005-01-18 22:26:04 UTC (rev 950)
+++ html/trunk/scripts/update-website.mk	2005-01-18 22:46:14 UTC (rev 951)
@@ -209,18 +209,19 @@
 # Validate XHTML files
 # FIXME: better on a pre-commit script?
 validate:
-	find -name \*.html -maxdepth 3 | fgrep -v -f scripts/rsync-ignore | while read file; do \
+	test -n "$(TARGETDIR)" && \
+	cd $(TARGETDIR) && \
+	find -name \*.html -maxdepth 3 | while read file; do \
 	xmllint --valid --noout $$file || exit 1; done
 
 # Copy these to the httpd error dirs
-# FIXME: need to make /home/httpd/error group-writable by lfswww
 error-pages: 403.html 404.html
-#	cp {403,404}.html /home/httpd/error
+	cp 40{3,4}.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)"
-	cd $(WWW_WC) && \
-	rsync -aq --exclude-from=scripts/rsync-ignore $$(find -maxdepth 1 -mindepth 1) $(TARGETDIR)/
+	test -n "$(TARGETDIR)" && \
+	rsync -an --delete --exclude-from=scripts/rsync-ignore \
+	$$(find -maxdepth 1 -mindepth 1) $(TARGETDIR)/




More information about the website mailing list