Tweak get release version from main bacula directory

[bacula/bacula] / bacula / release / makerescuerel

diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index c48b53044053bc7ff959dddb6a3f9a32d538f92c..3406f00ad673b0b143b21c2aac1e35dd046d0d43 100755 (executable)
--- a/bacula/release/makerescuerel
+++ b/bacula/release/makerescuerel
@@ -14,11 +14,13 @@ reltype=release
 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"
+remote=$2
+branch=$3
+ver=$4
+
+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
@@ -31,13 +33,15 @@ if [ $?  -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
 fi
+
+current=`git branch | awk '/*/ { print $2 }'`
 src=`pwd` 
 git checkout ${branch}
 if [ $? -ne 0 ]; then
    echo "Checkout of branch ${branch} in ${src} failed."
    exit 1
 fi
-git pull origin ${branch}
+git pull ${remote} ${branch}
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
@@ -47,7 +51,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"
@@ -67,11 +71,15 @@ if [ $? != 0 ] ; then
   exit 1
 fi
 echo "Exported release into ${cwd}/$base_pkg-$ver.tar.gz"
-git checkout master
+if [ a$push != ano ]; then
+   cd ${src}
+   git push ${remote} ${branch}
+#  git push ${remote} tag ${fulltag}
+   echo "Pushed ${remote}"
+fi
+cd ${src}
+git checkout ${current}
+
 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 " "