From cdf979c5adb29a958b3f71ffd132842ebc64ed77 Mon Sep 17 00:00:00 2001
From: Bryan Stansell <bryan@conserver.com>
Date: Tue, 26 Mar 2019 22:47:00 -0700
Subject: [PATCH] tweaking release process for next time

---
 package/README.md              |  2 +-
 package/make-and-stage-release | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/package/README.md b/package/README.md
index 53b541b..6e5a405 100644
--- a/package/README.md
+++ b/package/README.md
@@ -5,7 +5,7 @@ Creating a new release
 - Edit `conserver/version.h`
 - Update `CHANGES` with output of `./package/create-changes vx.y.z..`
 - Double-check and merge release branch
-- Run `./package/make-and-stage-release` to create distribution, pgp sign, tag release, and push to github
+- Run `GITHUB_TOKEN=xxxx ./package/make-and-stage-release` to tag release, create distribution, pgp sign, and push to github
 
 Requirements:
 
diff --git a/package/make-and-stage-release b/package/make-and-stage-release
index f1542fa..ec330d3 100755
--- a/package/make-and-stage-release
+++ b/package/make-and-stage-release
@@ -7,6 +7,14 @@ local=false && [ "$1" = "local" ] && local=true
 [ -f conserver/version.h ] || { echo "you are in the wrong place" ; exit 1; }
 
 ver=`./package/get-version number`
+
+echo "Ready to tag release v$ver (y/N)?"
+read i
+if [ "$i" = "y" ]; then
+    echo "Adding git tag v$ver"
+    git tag -a -m "Release $ver" v$ver
+fi
+
 if [ ! -f ../conserver-$ver.tar.gz ] || $local; then
     (
 	[ -d build ] && rm -rf build
@@ -37,12 +45,12 @@ ls -l ../conserver-$ver.tar.gz*
 echo "Ready to push (y/N)?"
 read i
 if [ "$i" = "y" ]; then
-    git tag -a -m "Release $ver" v$ver && git push
+    git push --tags
     githubrelease release conserver/conserver create --name conserver-$ver --body "$body" v$ver ../conserver-$ver.tar.gz* 
     echo You can publish this release on the website or with:
     echo "    "githubrelease release conserver/conserver publish v$ver
 else
     echo Ok, here is the command I would have used:
-    echo "    "git tag -a -m \""Release $ver"\" v$ver \&\& git push
+    echo "    "git push --tags
     echo "    "githubrelease release conserver/conserver create --name conserver-$ver --body \""$body"\" v$ver ../conserver-$ver.tar.gz* 
 fi