From b6135f8a9b4c2a9cf46a18dc3c03c18a4e3465eb Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 25 Jan 2010 08:56:28 +0100
Subject: [PATCH] Tweak release scripts

---
 bacula/release/makeall       |  3 ++-
 bacula/release/makebacularel | 14 ++++++++------
 bacula/release/makedocsrel   |  2 +-
 bacula/release/makerescuerel |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/bacula/release/makeall b/bacula/release/makeall
index 5721d5453e..37ef4b5438 100755
--- a/bacula/release/makeall
+++ b/bacula/release/makeall
@@ -8,7 +8,8 @@ branch=5.0.0
 bacula=/home/kern/bacula/k
 docs=/home/kern/bacula/docs
 rescue=/home/kern/bacula/rescue
-push=yes
+export push=yes
+export updatepo=yes
 
 ./makeclean
 ./makebacularel $bacula $branch
diff --git a/bacula/release/makebacularel b/bacula/release/makebacularel
index 7f963c0013..39c4334bbf 100755
--- a/bacula/release/makebacularel
+++ b/bacula/release/makebacularel
@@ -54,11 +54,13 @@ if [ $reltype != "beta" ] ; then
    rm -f 1
    cd ..
 fi
-./configure --enable-client-only
-cd po
-make update-po
-cd ${src}   
-git commit -am "Final po changes for ${fulltag}"
+if [ a$updatepo != ano ]; then
+   ./configure --enable-client-only
+   cd po
+   make update-po
+   cd ${src}   
+   git commit -am "Final po changes for ${fulltag}"
+fi
 git tag -d ${fulltag}
 echo "Creating new tag -- $fulltag"
 git tag $fulltag
@@ -99,5 +101,5 @@ cd ..
 if [ a$push != ano ]; then
    cd ${src}
    git push origin $branch
-   git push tag $fulltag
+   git push origin tag $fulltag
 fi
diff --git a/bacula/release/makedocsrel b/bacula/release/makedocsrel
index ff3cadb675..1073c1f6ef 100755
--- a/bacula/release/makedocsrel
+++ b/bacula/release/makedocsrel
@@ -107,5 +107,5 @@ ls -l $base_pkg-$ver.tar.*
 if [ a$push != ano ]; then
    cd ${src}
    git push origin $branch
-   git push tag $fulltag
+   git push origin tag $fulltag
 fi
diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index bb8c14d8e7..fc34b4a455 100755
--- a/bacula/release/makerescuerel
+++ b/bacula/release/makerescuerel
@@ -77,5 +77,5 @@ ls -l $base_pkg-$ver.tar.*
 if [ a$push != ano ]; then
    cd ${src}
    git push origin $branch
-   git push tag $fulltag
+   git push origin tag $fulltag
 fi
-- 
2.39.5