summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Pujol <alexandre@pujol.io>2017-03-20 19:14:47 (GMT)
committer Alexandre Pujol <alexandre@pujol.io>2017-03-20 19:14:47 (GMT)
commitbb77de0815d6a365cbebbf382de33e777caaea5d (patch)
tree663346b7167bbb345fcba8e8869bf1a8e3e57e14
parent29a177aa0528b58075d9ef4ac2d2e0240fea1ba6 (diff)
Fix compatibility with GnuPG 2.2.19refs/pull/250/head
GnuPG 2.2.19 added a warning when no command was given. Some invocations do not specify a command, added --decrypt in this these cases.
-rwxr-xr-xtomb4
1 files changed, 2 insertions, 2 deletions
diff --git a/tomb b/tomb
index 68b2ebb..9284c0e 100755
--- a/tomb
+++ b/tomb
@@ -1016,7 +1016,7 @@ gpg_decrypt() {
[[ $gpgver == "1.4.11" ]] && {
_verbose "GnuPG is version 1.4.11 - adopting status fix."
TOMBSECRET=`print - "$gpgpass" | \
- gpg ${gpgpopt[@]} --no-options`
+ gpg --decrypt ${gpgpopt[@]} --no-options`
ret=$?
unset gpgpass
return $ret
@@ -1025,7 +1025,7 @@ gpg_decrypt() {
_tmp_create
tmpres=$TOMBTMP
TOMBSECRET=`print - "$gpgpass" | \
- gpg ${gpgpopt[@]} --no-options \
+ gpg --decrypt ${gpgpopt[@]} --no-options \
--status-fd 2 --no-mdc-warning --no-permission-warning \
--no-secmem-warning 2> $tmpres`
unset gpgpass