Remove global variable shadowing by local variable.

[bacula/bacula] / bacula / release / makerescuerel

diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index 97cbfd0e0e609bc3dd8fd7c39f061abb2a849f58..2f8add903b4e3378eb1535c55512b7eddd76e5a0 100755 (executable)
--- a/bacula/release/makerescuerel
+++ b/bacula/release/makerescuerel
@@ -15,7 +15,7 @@ tagbase=Release-
 base_pkg=bacula-rescue
 base_dir=rescue
 branch=$2
-ver=$2
+
 if [ $# != 2 ] ; then
   echo "Need $0 <rescue-source-directory> <branch>"
   echo "e.g. $0 rescue-source master"
@@ -31,6 +31,7 @@ if [ $?  -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
 fi
+
 src=`pwd` 
 git checkout ${branch}
 if [ $? -ne 0 ]; then
@@ -38,6 +39,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 git pull origin ${branch}
+ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h`
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
@@ -72,6 +74,8 @@ cd ${cwd}
 ./sign $base_pkg-$ver.tar.gz
 ls -l $base_pkg-$ver.tar.*
 
-cd ${src}
-git push
-git push --tags
+if [ a$push != ano ]; then
+   cd ${src}
+   git push origin $branch
+   git push origin tag $fulltag
+fi