Tweak get release version from main bacula directory

[bacula/bacula] / bacula / release / makedocsrel

diff --git a/bacula/release/makedocsrel b/bacula/release/makedocsrel
index 38b9dd613f302ebc358ce152d8672485a1cbd94f..db14612fdcf6bce8d0e741507dc425d4eec405f1 100755 (executable)
--- a/bacula/release/makedocsrel
+++ b/bacula/release/makedocsrel
@@ -16,9 +16,11 @@ base_dir=docs
 base_pkg=bacula-$base_dir
 remote=$3
 branch=$4
-if [ $# != 4 ] ; then
-  echo "Need $0 <bacula-source-directory> <docs-source-directory> <remote-name> <branch>"
-  echo "e.g. $0 bacula-source docs-source bee master"
+ver=$5
+
+if [ $# != 5 ] ; then
+  echo "Need $0 <bacula-source-directory> <docs-source-directory> <remote-name> <branch> <version>"
+  echo "e.g. $0 bacula-source docs-source bee master 4.0.1"
   exit 1
 fi
 cd $1
@@ -58,7 +60,6 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 git pull ${remote} ${branch}
-ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${bsrc}/src/version.h`
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
@@ -107,8 +108,8 @@ ls -l $base_pkg-$ver.tar.*
 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}