Tweak get release version from main bacula directory

[bacula/bacula] / bacula / release / makerescuerel

diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index 69bb5e13ce7ace169a2d1d0f20d76270ebc3437b..3406f00ad673b0b143b21c2aac1e35dd046d0d43 100755 (executable)
--- a/bacula/release/makerescuerel
+++ b/bacula/release/makerescuerel
@@ -16,10 +16,11 @@ base_pkg=bacula-rescue
 base_dir=rescue
 remote=$2
 branch=$3
+ver=$4
 
-if [ $# != 3 ] ; then
-  echo "Need $0 <rescue-source-directory> <remote-name> <branch>"
-  echo "e.g. $0 rescue-source bee Branch-4.0"
+if [ $# != 4 ] ; then
+  echo "Need $0 <rescue-source-directory> <remote-name> <branch> <version>"
+  echo "e.g. $0 rescue-source bee Branch-4.0 4.0.1"
   exit 1
 fi
 cd $1
@@ -41,7 +42,6 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 git pull ${remote} ${branch}
-ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h`
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
@@ -74,8 +74,8 @@ echo "Exported release into ${cwd}/$base_pkg-$ver.tar.gz"
 if [ a$push != ano ]; then
    cd ${src}
    git push ${remote} ${branch}
-   git push ${remote} tag ${fulltag}
-   echo "Pushed ${remote} and push tag ${fulltag}"
+#  git push ${remote} tag ${fulltag}
+   echo "Pushed ${remote}"
 fi
 cd ${src}
 git checkout ${current}