Fix ActionOnPurge with a relabel command

[bacula/bacula] / bacula / release / makerescuerel

diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index c48b53044053bc7ff959dddb6a3f9a32d538f92c..fc34b4a45522907eeb392321a3f9d94580591fb5 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,8 @@ if [ $?  -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
 fi
+
+ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h`
 src=`pwd` 
 git checkout ${branch}
 if [ $? -ne 0 ]; then
@@ -47,7 +49,7 @@ read a
 
 git tag -d ${fulltag}
 echo "Creating new tag -- $fulltag"
-git tag $fulltag -m "Create tag $fulltag"
+git tag $fulltag
 if [ $? != 0 ] ; then
   echo " "
   echo "Non-zero return status from Git"
@@ -72,6 +74,8 @@ cd ${cwd}
 ./sign $base_pkg-$ver.tar.gz
 ls -l $base_pkg-$ver.tar.*
 
-echo " "
-echo "If everything is OK, don't forget to push $src tags to the repo"
-echo " "
+if [ a$push != ano ]; then
+   cd ${src}
+   git push origin $branch
+   git push origin tag $fulltag
+fi