Fix ActionOnPurge with a relabel command

[bacula/bacula] / bacula / release / makerescuerel

diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index 789b36c33340d273c312097c6e7b121a6e81f76d..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
@@ -74,6 +76,6 @@ ls -l $base_pkg-$ver.tar.*
 
 if [ a$push != ano ]; then
    cd ${src}
-   git push
-   git push --tags
+   git push origin $branch
+   git push origin tag $fulltag
 fi