From 4b32408001b8017df57cdd653eac4881cba48da2 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Thu, 31 Aug 2017 22:41:28 +0200
Subject: [PATCH] Finally get a release out with this script.

---
 deploy-master.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/deploy-master.sh b/deploy-master.sh
index 7e18f29..3bf47cd 100755
--- a/deploy-master.sh
+++ b/deploy-master.sh
@@ -5,45 +5,48 @@
 set -eu -o pipefail
 
 BASE_DIR=$(dirname $(readlink -f "$0"))
-cd $(BASE_DIR)
+cd $BASE_DIR
+
+git fetch --tags
 
 PROJECT_NAME=parso
 BRANCH=master
 BUILD_FOLDER=build
-FOLDER=$BUILD_FOLDER/$PROJECT_NAME
-
-# Test first.
-#tox
 
 [ -d $BUILD_FOLDER ] || mkdir $BUILD_FOLDER
 # Remove the previous deployment first.
-rm -rf $FOLDER
 # Checkout the right branch
 cd $BUILD_FOLDER
+rm -rf $PROJECT_NAME
 git clone .. $PROJECT_NAME
+cd $PROJECT_NAME
 git checkout $BRANCH
 
+# Test first.
+tox
+
 # Create tag
 tag=v$(python -c "import $PROJECT_NAME; print($PROJECT_NAME.__version__)")
 
-master_ref=$(git show-ref -s $BRANCH)
-tag_ref=$(git show-ref -s $tag | true)
-if [ $tag_ref ]; then
-    if [ $tag_ref != $master_ref ]; then
+master_ref=$(git show-ref -s heads/$BRANCH)
+tag_ref=$(git show-ref -s $tag || true)
+if [[ $tag_ref ]]; then
+    if [[ $tag_ref != $master_ref ]]; then
         echo 'Cannot tag something that has already been tagged with another commit.'
         exit 1
     fi
 else
-    git tag $BRANCH
+    git tag $tag
     git push --tags
 fi
 
 # Package and upload to PyPI
-rm -rf dist/
+#rm -rf dist/ - Not needed anymore, because the folder is never reused.
+echo `pwd`
 python setup.py sdist bdist_wheel
 # Maybe do a pip install twine before.
 twine upload dist/*
 
-cd $(BASE_DIR)
+cd $BASE_DIR
 # Back in the development directory fetch tags.
 git fetch --tags