[tor-commits] [tor-browser-spec/master] Some release process tweaks.

[mikeperry at torproject.org]

commit e5dba878f924d1f2230b487a4303dbaf2033517a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Aug 19 03:08:40 2015 -0700

    Some release process tweaks.
---
 processes/ReleaseProcess |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index b4dca6a..dddf02e 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -89,7 +89,7 @@
 #. Clear out old builds, transfer builds to staticiforme
 #. Remote:
    # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix
-   torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+   torsocks rsync -avP $TORBROWSER_VERSION staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/
    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:
@@ -98,13 +98,16 @@
    eval $( ./get-tb-version release ) # or alpha / beta
    # We must use $TORBROWSER_VERSION here because signed result dirs should omit the build number suffix
    wget -nH --cut-dirs=2 -r -l 1 https://people.torproject.org/~gk/builds/$TORBROWSER_VERSION
-   # Verify everything was downloaded correctly
-   for i in $TORBROWSER_VERSION/*.asc; do echo $i ; gpg -q $i || break; done
    rm $TORBROWSER_VERSION/index.html*
    mv $TORBROWSER_VERSION /srv/dist-master.torproject.org/htdocs/torbrowser/
    chmod 775 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
    chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/*
+   # XXX: Need to manually get .htaccess :(
+   chmod 664 /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION/.htaccess
    chown -R :torwww /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+   # Verify everything was downloaded/copied correctly
+   cd /srv/dist-master.torproject.org/htdocs/torbrowser/$TORBROWSER_VERSION
+   for i in *.asc; do echo $i ; gpg -q $i || break; done
    static-update-component dist.torproject.org
 
 #. Update website's torbrowser versions file in the website git
@@ -130,9 +133,11 @@
    # responses!
    make update_responses # (or update_responses-alpha, update_responses-beta)
    cd ../tools/update-responses
+   # XXX: nothing sets $TORBROWSER_UPDATE_CHANNEL here..
    chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/*
    chmod 664 htdocs/$TORBROWSER_UPDATE_CHANNEL/.htaccess
    chmod 775 htdocs/$TORBROWSER_UPDATE_CHANNEL/
+   torsocks ssh staticiforme.torproject.org "rm -rf /srv/dist-master.torproject.org/htdocs/torbrowser/update_2/${TORBROWSER_UPDATE_CHANNEL}/*"
    torsocks rsync -avP htdocs/$TORBROWSER_UPDATE_CHANNEL staticiforme.torproject.org:/srv/dist-master.torproject.org/htdocs/torbrowser/update_2/
    # Finally, remove old version as we point the update channel at the new version.
    # XXX: CAREFUL! $OLD_TOR_BROWSER_VERSION must be set!