commit eab449ac811bdcb6166626343d9d9d26ce5a46bc Author: Georg Koppen gk@torproject.org Date: Tue Feb 17 11:13:11 2015 +0000

Bug 14221: Taking care of *build* directories --- processes/ReleaseProcess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index 428b89c..c807508 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -66,18 +66,18 @@ #. Remote: # XXX: Be aware that this command would delete ALL Tor Browser 4.x.x versions! torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/4.*" - torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/ + torsocks rsync -avP $TORBROWSER_VERSION-build1/ staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION torsocks ssh staticiforme.torproject.org "chmod g+w,o+r -R /srv/dist-master.torproject.org/htdocs/torbrowser/*" torsocks ssh staticiforme.torproject.org "static-update-component dist.torproject.org" #. Local to staticiforme: cd /tmp - wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION - rm $TORBROWSER_VERSION/index.html* + wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~mikeperry/builds/$TORBROWSER_VERSION-build1 + rm $TORBROWSER_VERSION-build1/index.html* # $OLD_TORBROWSER_VERSION is the value for exactly the one version that should # get superseded by $TORBROWSER_VERSION. rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/$OLD_TORBROWSER_VERSION cd /srv/dist-master.torproject.org/htdocs/torbrowser/ - mv /tmp/$TORBROWSER_VERSION . + mv /tmp/$TORBROWSER_VERSION-build1 $TORBROWSER_VERSION # We need to adjust permissions *after* we copied the new version to dist-master chmod 775 $TORBROWSER_VERSION chmod 664 $TORBROWSER_VERSION/*