From 33e6bd2b5c56a688dc1b9b7fe3e9f5c0a30f0802 Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 4 May 2010 15:54:15 +0200
Subject: [PATCH] update release scripts

---
 bacula/release/makeclean     | 2 +-
 bacula/release/makerescuerel | 2 +-
 bacula/release/makewinrel    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bacula/release/makeclean b/bacula/release/makeclean
index ec44b8b002..9ed063381d 100755
--- a/bacula/release/makeclean
+++ b/bacula/release/makeclean
@@ -1,2 +1,2 @@
 #!/bin/sh
-rm -rf bacula-* winbacula* win64bacula*
+rm -rf bacula-* win32bacula* win64bacula*
diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
index fc34b4a455..2f8add903b 100755
--- a/bacula/release/makerescuerel
+++ b/bacula/release/makerescuerel
@@ -32,7 +32,6 @@ if [ $?  -ne 0 ]; then
    exit 1
 fi
 
-ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h`
 src=`pwd` 
 git checkout ${branch}
 if [ $? -ne 0 ]; then
@@ -40,6 +39,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 git pull origin ${branch}
+ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' version.h`
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
diff --git a/bacula/release/makewinrel b/bacula/release/makewinrel
index b119efc10b..ad29d78d66 100755
--- a/bacula/release/makewinrel
+++ b/bacula/release/makewinrel
@@ -30,7 +30,6 @@ if [ $?  -ne 0 ]; then
    echo "Directory: $1 does not exist"
    exit 1
 fi
-ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h`
 src=`pwd` 
 git checkout ${branch}
 if [ $? -ne 0 ]; then
@@ -38,6 +37,7 @@ if [ $? -ne 0 ]; then
    exit 1
 fi
 git pull origin ${branch}
+ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h`
 fulltag=$tagbase$ver
 echo " "
 echo "Making $reltype for $base_pkg-$ver ..."
@@ -46,16 +46,16 @@ echo "OK?  ctl-c to stop"
 read a
 
 cd src/win32
-rm -f release32/winbacula-$ver.exe
+rm -f release32/win32bacula-$ver.exe
 rm -f release64/win64bacula-$ver.exe
 make clean
 ./makeall
-cp release32/winbacula-$ver.exe ${cwd}
+cp release32/win32bacula-$ver.exe ${cwd}
 cp release64/win64bacula-$ver.exe ${cwd}
 git checkout master
 cd ${cwd}
 rm -f *.exe.sig
-./sign winbacula-$ver.exe
+./sign win32bacula-$ver.exe
 ./sign win64bacula-$ver.exe
 ls -l win*.exe*
 
-- 
2.39.5