diff options
| -rwxr-xr-x | firma | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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" |