Modify ./release/sign to be able to use an other gpgkey (idea from Bruno)

diff --git a/bacula/release/config b/bacula/release/config
index acfebe7d332e0b764cc9394f82eab014dbb9d3f3..fda09c874f8cdaceba59ef8b0c6c529e911ed0c6 100644 (file)
--- a/bacula/release/config
+++ b/bacula/release/config
@@ -15,16 +15,17 @@ repo=$reltype
 # Bacula git repos
 bacula=${bacula:-${HOME}/bee/bacula}
 docs=${docs:-${HOME}/bee/docs}
+gpgkey=${gpgkey:-bacula}
 
 #
 # Set the following to your remote name.  By default it is origin.
 remote=${remote:-origin}
+push=no
 
-export push=no
 #
 # Note, you will probably want to set updatepo=no if you
 #   run this script multiple times for a given release.
-export updatepo=no
+updatepo=no
 
 cwd=`pwd`
 
@@ -44,5 +45,6 @@ ver=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' src/version.h`
 lsmdate=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' src/version.h`
 
 git checkout ${current}
+export push updatepo gpgkey
 
 cd $cwd

diff --git a/bacula/release/sign b/bacula/release/sign
index 964780d2f167986c60b5749c139325ea6ffb0ca4..872b2af749a75966d4b515c4b8886be33ca36547 100755 (executable)
--- a/bacula/release/sign
+++ b/bacula/release/sign
@@ -1,3 +1,3 @@
 #!/bin/sh
-gpg --detach-sign --armor --default-key bacula -o $1.sig $1
+gpg --detach-sign --armor --default-key $gpgkey -o $1.sig $1
 gpg --verify $1.sig