Refactor, DRY

[git-tools-moved-to-github.git] / id-release

diff --git a/id-release b/id-release
index 5acbcfb..22035f8 100755 (executable)
--- a/id-release
+++ b/id-release
@@ -16,14 +16,32 @@ usage () {
     exit 1
 }
 
+branch_check () {
+    if ! git branch | egrep -q '^\* master$'; then
+       ( echo ">>> Warning: you are not running on the master branch <<<"
+         git branch; echo ) 1>&2
+    fi
+}
+
 ######################################################################
+branch_check
+
 case $1 in
   [0-9]* ) version=$1 ;;
        * ) usage ;;
 esac
 
-echo "# See also https://twiki.indexdata.com/twiki/bin/view/ID/AdamsReleaseProcedure"
-echo ""
+
+
+cat <<EOF
+#!/bin/sh
+#
+# See also https://twiki.indexdata.com/twiki/bin/view/ID/AdamsReleaseProcedure
+#
+
+set -e
+
+EOF
 
 echo "# Did you updated the news log file?"
 for file in Changes News NEWS
@@ -66,7 +84,8 @@ fi
 
 if $perl; then
   echo "# check perl version numbers"
-  find . -name '*.pm' -print0 | xargs -0 egrep -H '\$VERSION.*=.*[0-9]' | egrep -v '^\./deb-src/'
+  find . -name '*.pm' -print0 | xargs -0 egrep -H '\$VERSION.*=.*[0-9]' | 
+       egrep -v '^\./deb-src/' | perl -npe 's,^,# ,'
 fi
 
 # update debian version file
@@ -99,3 +118,5 @@ echo "# if successfully, don't forget to push to origin"
 echo "git push origin master"
 echo "git push origin tag v$version"
 
+# EOF
+