Allow overriding GnuPG home directory

[buildbot.git] / phase1 / signall.sh

diff --git a/phase1/signall.sh b/phase1/signall.sh
index 015470dd45ef59628228f64054c2617f954b0a9a..d256131623a3372a76a275172a3dd52dbfc57419 100755 (executable)
--- a/phase1/signall.sh
+++ b/phase1/signall.sh
@@ -2,8 +2,7 @@
 
 tarball="$1"
 keyid="$2"
-passfile="$3"
-comment="$4"
+comment="$3"
 
 tmpdir="signall.$$"
 tarball="$(readlink -f "$tarball")"
@@ -13,7 +12,7 @@ finish() { rm -rf "$tmpdir"; exit $1; }
 trap "finish 255" HUP INT TERM
 
 if [ ! -f "$tarball" ]; then
-       echo "Usage: $0 <tarball> [<keyid> [<passfile> [<comment>]]]"
+       echo "Usage: [GNUPGHOME=... [PASSFILE=...]] $0 <tarball> [<keyid> [<comment>]]"
        finish 1
 fi
 
@@ -21,7 +20,15 @@ umask 022
 
 mkdir "$tmpdir" || finish 2
 tar -C "$tmpdir/" -xzf "$tarball" || finish 3
-find "$tmpdir/" -type f -not -name "*.gpg" -exec gpg --no-version --batch --yes -a -b ${keyid:+-u "$keyid"} ${comment:+--comment="$comment"} ${passfile:+--passphrase-file "$passfile"} -o "{}.gpg" "{}" \; || finish 4
+
+find "$tmpdir/" -type f -not -name "*.gpg" -exec gpg \
+       --no-version --batch --yes -a -b \
+       ${keyid:+-u "$keyid"} \
+       ${comment:+--comment="$comment"} \
+       ${GNUPGHOME:+--homedir "$GNUPGHOME"} \
+       ${PASSFILE:+--passphrase-file "$PASSFILE"} \
+       -o "{}.gpg" "{}" \; || finish 4
+
 tar -C "$tmpdir/" -czf "$tarball" . || finish 5
 
 finish 0