Author: sebastian Date: 2012-02-19 12:54:52 +0000 (Sun, 19 Feb 2012) New Revision: 25456 Modified: website/trunk/Makefile website/trunk/publish Log: Revert the non-version changes of previous commit Looks like a ton of stuff got accidentally committed Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2012-02-19 12:44:32 UTC (rev 25455) +++ website/trunk/Makefile 2012-02-19 12:54:52 UTC (rev 25456) @@ -11,7 +11,7 @@ # 5. ./publish export STABLETAG=tor-0.2.2.35 -export DEVTAG=tor-0.2.3.11-alpha +export DEVTAG=tor-0.2.3.12-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/publish =================================================================== --- website/trunk/publish 2012-02-19 12:44:32 UTC (rev 25455) +++ website/trunk/publish 2012-02-19 12:54:52 UTC (rev 25456) @@ -1,17 +1,41 @@ #!/bin/sh set -e # stop if we encounter an error -make clean # clean cruft +# pull the latest changes +if [ -e .svn ] ; then + svn update +elif [ -e .git ] ; then + git svn rebase +else + echo 2>&1 "Cannot figure out which version control thing you're using. Skipping update" +fi -svn update # get changes +# clean up the working directory +make clean -make -j3 # abuse the cores +# actually build the site +make -j3 # don't copy over stuff with permissions that make it useless -#chmod a+r * -R chmod -R a+r * -rsync --exclude .svn --exclude .deps --exclude svn --exclude dist --exclude releases --exclude torbutton-current.xpi --exclude project -Prvz --delete . vescum:/srv/www-master.torproject.org/htdocs +rsync \ + --exclude .DS_Store \ + --exclude .svn \ + --exclude .git \ + --exclude '.*.sw[po]' \ + --exclude .deps \ + --exclude svn \ + --exclude dist \ + --exclude releases \ + --exclude torbutton-current.xpi \ + --exclude project \ + -Prvz --delete . www-master.torproject.org:/srv/www-master.torproject.org/htdocs echo "Forcing mirror update" -ssh vescum '/home/mirroradm/bin/trigger-mirrors' -ssh vescum chmod g+w -R /srv/www-master.torproject.org/htdocs +ssh www-master.torproject.org ' + ( + find /srv/www-master.torproject.org/htdocs ! -perm -444 -print0 | xargs -0 --no-run-if-empty chmod -v a+r || + ( echo >&2 "There are unreadable files in /srv/www-master.torproject.org/htdocs, not triggering mirror run."; exit 1) + ) && + echo "Triggering mirror run" && + /home/mirroradm/bin/trigger-mirrors'