r821 - trunk/scripts

lizardo at linuxfromscratch.org lizardo at linuxfromscratch.org
Sun Aug 8 16:49:39 PDT 2004


Author: lizardo
Date: 2004-08-08 17:49:37 -0600 (Sun, 08 Aug 2004)
New Revision: 821

Modified:
   trunk/scripts/update-website.mk
Log:
Fixed rsync rule and changed the SVN log rules.


Modified: trunk/scripts/update-website.mk
===================================================================
--- trunk/scripts/update-website.mk	2004-08-08 05:22:39 UTC (rev 820)
+++ trunk/scripts/update-website.mk	2004-08-08 23:49:37 UTC (rev 821)
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
 # Usage: first run "update-website.mk svn-checkout" to create an initial
-# repository on TARGET, if it does not exist yet. To update the website, run
-# update-website.mk without arguments.
+# repository on TARGETDIR, if it does not exist yet. To update the website,
+# run update-website.mk without arguments.
 
 SVN = svn://svn.linuxfromscratch.org
 REV = HEAD
@@ -47,7 +47,10 @@
 
 # Useful for the initial repository setup
 svn-checkout:
+# The setgid bit on dirs forces all files under it to have the same group of
+# TARGETDIR
 	mkdir -m 2755 -p $(TARGETDIR)
+	chgrp -Rf lfswww $(TARGETDIR)
 	svn -q checkout $(SVN)/www/trunk $(TARGETDIR)
 	mkdir -p $(TARGETDIR)/patches/downloads
 	svn -q checkout $(SVN)/patches/trunk $(TARGETDIR)/patches/downloads
@@ -76,10 +79,10 @@
 svnlog-%:
 	mkdir -p logs
 	$(SVNLOG) $(SVN)/$* 2>/dev/null | $(SVN2HTML) --with-branchname > logs/$*.html.tmp
+	cmp -s logs/$*.html.tmp logs/$*.html || cp logs/$*.html.tmp logs/$*.html
+	rm logs/$*.html.tmp
 
 logs/%.html: svnlog-%
-	cmp -s $@.tmp $@ || cp $@.tmp $@
-	rm $@.tmp
 
 website.html: $(TEMPLATES)/website-*.html logs/www.html
 	cat $(TEMPLATES)/website-top.html \
@@ -183,9 +186,8 @@
 # Set proper permissions
 set-perms:
 	chmod -Rf g+w .
-	chgrp -Rf lfswww .
 
 run-rsync:
 	for m in $(MIRRORS); do \
-	rsync -aq --exclude-from=scripts/rsync-ignore $(TARGETDIR) $$m::lfs; \
+	rsync -aq --exclude-from=scripts/rsync-ignore $(TARGETDIR)/ $$m::lfs; \
 	done




More information about the website mailing list