X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=id-release;h=22035f8ae5797901e071e36276d6ed54710915c4;hb=839efe6d8548bf2453b282bd49cf1deca4ad079f;hp=803994656b15f53249aead72643a943084fbd790;hpb=3460d0e0459b71f8c4bb86357c7184d60aa6f53b;p=git-tools-moved-to-github.git

diff --git a/id-release b/id-release
index 8039946..22035f8 100755
--- a/id-release
+++ b/id-release
@@ -16,16 +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 "#!/bin/sh"
-echo "# See also https://twiki.indexdata.com/twiki/bin/view/ID/AdamsReleaseProcedure"
-echo "set -e"
-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
@@ -68,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