aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto>2006-10-10 03:28:55 +0000
committerrhatto <rhatto>2006-10-10 03:28:55 +0000
commita235ab003e5131801fab574ef94025e84afc3a68 (patch)
tree29c70e9ddd94bea9841065840d6c6ce9310abfbc
parentbf71a39de512384566d886b41a26d89e598d3d36 (diff)
downloadfirma-a235ab003e5131801fab574ef94025e84afc3a68.tar.gz
firma-a235ab003e5131801fab574ef94025e84afc3a68.tar.bz2
SubscribeUsers minor fix and created GPG_NOBATCH variable
-rwxr-xr-xfirma7
1 files changed, 4 insertions, 3 deletions
diff --git a/firma b/firma
index d3e733c..0a00530 100755
--- a/firma
+++ b/firma
@@ -145,8 +145,9 @@ function DeclareGpgVars {
# depends on function(s): none
# returns: 0
#-------------------------------------------------------------
- GPG_FLAGS="--no-options --no-default-keyring --homedir $LIST_HOMEDIR --quiet --batch --no-tty --no-use-agent --no-permission-warning"
- GPG="$GPG_BINARY $GPG_FLAGS"
+ GPG_FLAGS="--no-options --no-default-keyring --homedir $LIST_HOMEDIR --quiet --no-tty --no-use-agent --no-permission-warning"
+ GPG="$GPG_BINARY $GPG_FLAGS --batch"
+ GPG_NOBATCH="$GPG_BINARY $GPG_FLAGS --no-batch"
GPG_LIST_KEYS="$GPG --list-keys --with-colons"
GPG_DECRYPT="$GPG --passphrase-fd 0 --decrypt"
GPG_ENCRYPT="$GPG --armor --trust-model always --local-user $LIST_ADDRESS --passphrase-fd 0 --no-emit-version --sign --encrypt"
@@ -1503,7 +1504,7 @@ function SubscribeUsers {
method="--recv-keys"
fi
shift
- $GPG --no-batch --keyserver $keyserver $method $*
+ $GPG_NOBATCH --keyserver $keyserver $method $*
return_code=$?
else
echo >&2 "subscribe: missing parameters: type subscribe help"