commit bd182fcc4ad77fe9ec3f8995dfdf4f1675e2b748 Author: Mike Perry <mikeperry-git@torproject.org> Date: Thu Nov 21 12:52:47 2013 -0800 Fix signature generation issues. --- gitian/check-match.sh | 2 +- gitian/hash-bundles.sh | 5 ++++- gitian/upload-signature.sh | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gitian/check-match.sh b/gitian/check-match.sh index 90f2025..1958e4a 100755 --- a/gitian/check-match.sh +++ b/gitian/check-match.sh @@ -3,7 +3,7 @@ # XXX: Args? HOST=people.torproject.org BASE_DIR=public_html/builds/ -USERS="ln5 mikeperry helix gk" +USERS="ln5 mikeperry erinn gk" set -e set -u diff --git a/gitian/hash-bundles.sh b/gitian/hash-bundles.sh index cbc0539..20a26d0 100755 --- a/gitian/hash-bundles.sh +++ b/gitian/hash-bundles.sh @@ -23,4 +23,7 @@ sha256sum `ls -1 | sort` > sha256sums.txt echo echo "If this is an official build, you should now sign your result with: " -echo " cd $TORBROWSER_VERSION && gpg -abs sha256sums.txt" +echo " make sign" +echo +echo "In either case, you can check against any official builds with: " +echo " make match" diff --git a/gitian/upload-signature.sh b/gitian/upload-signature.sh index bdfa7db..ffb97fe 100755 --- a/gitian/upload-signature.sh +++ b/gitian/upload-signature.sh @@ -22,11 +22,13 @@ fi . $VERSIONS_FILE -if [ ! -f $TORBROWSER_VERSION/sha256sums.txt ]; +if [ ! -f $TORBROWSER_VERSION/sha256sums.txt.asc ]; then - cd $TORBROWSER_VERSION && gpg -abs sha256sums.txt + pushd $TORBROWSER_VERSION && gpg -abs sha256sums.txt + popd fi + ssh $HOST "mkdir -p $BASE_DIR/$TORBROWSER_VERSION" scp $TORBROWSER_VERSION/sha256sums.txt* $HOST:$BASE_DIR/$TORBROWSER_VERSION/ ssh $HOST "chmod 755 $BASE_DIR/$TORBROWSER_VERSION && chmod 644 $BASE_DIR/$TORBROWSER_VERSION/*"