From 2bfaf7fd00861409df7c1a9aae02b4e9fe235a65 Mon Sep 17 00:00:00 2001
From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 12 Aug 2015 16:43:27 +0200
Subject: [PATCH] Tweak release directory

---
 bacula/release/config        |  4 +-
 bacula/release/makerescuerel | 83 ------------------------------------
 bacula/release/upload        | 23 +++++-----
 3 files changed, 14 insertions(+), 96 deletions(-)
 delete mode 100755 bacula/release/makerescuerel

diff --git a/bacula/release/config b/bacula/release/config
index 578e103cdb..e6d9cbfce9 100644
--- a/bacula/release/config
+++ b/bacula/release/config
@@ -6,10 +6,10 @@
 #
 # Set to the Branch you are working on
 #
-branch=${branch:-Branch-5.3}
+branch=${branch:-Branch-7.2}
 #
 # set reltype to release or beta -- for upload and setting DEVELOPER
-reltype=beta
+reltype=release
 
 repo=$reltype
 
diff --git a/bacula/release/makerescuerel b/bacula/release/makerescuerel
deleted file mode 100755
index 9eda4041d8..0000000000
--- a/bacula/release/makerescuerel
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2000-2015 Kern Sibbald
-# License: BSD 2-Clause; see file LICENSE-FOSS
-#
-# This script is used to make a Bacula rescue release
-#   rescue
-# It writes in the current directory, so we recommend that you
-#  do not run it in the Bacula source or Git directory, but
-#  in a special release directory.
-#
-# Commit all changes, export the release, make a release tar.
-#
-cwd=`pwd`
-reltype=release
-tagbase=Release-
-base_pkg=bacula-rescue
-base_dir=rescue
-branch=$2
-
-if [ $# != 2 ] ; then
-  echo "Need $0 <rescue-source-directory> <branch>"
-  echo "e.g. $0 rescue-source master"
-  exit 1
-fi
-cd $1
-if [ $? -ne 0 ]; then
-   echo "Directory: $1 does not exist"
-   exit 1
-fi
-cd $base_dir
-if [ $?  -ne 0 ]; then
-   echo "Directory: $1 does not exist"
-   exit 1
-fi
-
-src=`pwd` 
-git checkout ${branch}
-if [ $? -ne 0 ]; then
-   echo "Checkout of branch ${branch} in ${src} failed."
-   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 ..."
-echo " "
-echo "OK?  ctl-c to stop"
-read a
-
-git tag -d ${fulltag}
-echo "Creating new tag -- $fulltag"
-git tag $fulltag
-if [ $? != 0 ] ; then
-  echo " "
-  echo "Non-zero return status from Git"
-  echo " "
-  exit 1
-fi
-echo "Create Tag $fulltag done"
-cd ${cwd}
-rm -rf $base_pkg-$ver $base_pkg-$ver.tar.gz $base_pkg-$ver.tar.gz.sig
-rm -rf $fulltag
-cd ${src}
-git archive --format=tar --prefix=$base_pkg-$ver/ $fulltag | gzip >${cwd}/$base_pkg-$ver.tar.gz
-if [ $? != 0 ] ; then
-  echo " "
-  echo "Non-zero return status from Git"
-  echo " "
-  exit 1
-fi
-echo "Exported release into ${cwd}/$base_pkg-$ver.tar.gz"
-git checkout master
-cd ${cwd}
-./sign $base_pkg-$ver.tar.gz
-ls -l $base_pkg-$ver.tar.*
-
-if [ a$push != ano ]; then
-   cd ${src}
-   git push origin $branch
-   git push origin tag $fulltag
-fi
diff --git a/bacula/release/upload b/bacula/release/upload
index f1d18bb7c2..184408e3ba 100755
--- a/bacula/release/upload
+++ b/bacula/release/upload
@@ -3,33 +3,34 @@
 # Copyright (C) 2000-2015 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
-# Upload to File Release System on server
+# Upload to File Release System on serfullver
 #
 . ./config
 
-ver="7.0.5"
+ver="7.2.0"
+fullver="bacula-7.2.0"
 RSYNC="rsync -av --no-g --progress $upload_opt"
 
 do_upload()
 {
 where=$1
-echo "Creating ${where}:/home/src/$ver"
+echo "Creating ${where}:/var/www/bacula/downloads/$fullver"
 ssh ${where} <<EOF
-cd /home/src
-mkdir -p $ver
+cd /var/www/bacula/downloads/
+mkdir -p $fullver
 EOF
 
 echo "Uploading source"
 for i in bacula-*-$ver*; do \
-   echo "Uplod $i to ${where}:/home/src/$ver"
-   $RSYNC $i ${where}:/home/src/$ver/; \
+   echo "Uplod $i to ${where}:/var/www/bacula/downloads/$fullver"
+   $RSYNC $i ${where}:/var/www/bacula/downloads/$fullver/; \
 done
 
 # Upload release notes
-echo "Uplod ReleaseNote to ${where}:/home/src/$ver"
-$RSYNC ReleaseNotes ${where}:/home/src/$ver/
-echo "Uplod ChangeLog to ${where}:/home/src/$ver"
-$RSYNC ChangeLog ${where}:/home/src/$ver/
+echo "Uplod ReleaseNote to ${where}:/var/www/bacula/downloads/$fullver"
+$RSYNC ReleaseNotes ${where}:/var/www/bacula/downloads/$fullver/
+echo "Uplod ChangeLog to ${where}:/var/www/bacula/downloads/$fullver"
+$RSYNC ChangeLog ${where}:/var/www/bacula/downloads/$fullver/
 
 
 }
-- 
2.39.5