release.sh edits based on 2013.01.02 experience

diff --git a/devscripts/release.sh b/devscripts/release.sh
index 776f176461c9022283f90ca43c79f60e74c54779..0926c40383a93efbc4aece956c0e51d31452ac69 100755 (executable)
--- a/devscripts/release.sh
+++ b/devscripts/release.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
 
 # IMPORTANT: the following assumptions are made
-# * you did --set-upstream
+# * the GH repo is on the origin remote
 # * the gh-pages branch is named so locally
 # * the git config user.signingkey is properly set
 
 # You will need
 # pip install coverage nose rsa
 
+# TODO
+# release notes
+# make hash on local files
+
 set -e
 
 if [ -z "$1" ]; then echo "ERROR: specify version number like this: $0 1994.09.06"; exit 1; fi
@@ -34,7 +38,9 @@ git show "$version"
 read -p "Is it good, can I push? (y/n) " -n 1
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
 echo
-git push
+MASTER=$(git rev-parse --abbrev-ref HEAD)
+git push origin $MASTER:master
+git push origin "$version"
 
 echo "\n### OK, now it is time to build the binaries..."
 REV=$(git rev-parse HEAD)
@@ -52,7 +58,6 @@ scp -r "update_staging/$version" ytdl@youtube-dl.org:html/downloads/
 rm -r update_staging
 
 echo "\n### Now switching to gh-pages..."
-MASTER=$(git rev-parse --abbrev-ref HEAD)
 git checkout gh-pages
 git checkout "$MASTER" -- devscripts/gh-pages/
 git reset devscripts/gh-pages/
@@ -68,7 +73,8 @@ git show HEAD
 read -p "Is it good, can I push? (y/n) " -n 1
 if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
 echo
-git push
+git push origin gh-pages
 
 echo "\n### DONE!"
+rm -r devscripts
 git checkout $MASTER