From bc021c53b6d49032efab050a8f1f6b44804916ac Mon Sep 17 00:00:00 2001 From: James Rowe Date: Sun, 8 Nov 2020 20:26:19 +0000 Subject: Allow gpg and gpg2 executables for gnupg interaction Closes: #193 [via git-merge-pr] --- contrib/mverify | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'contrib/mverify') diff --git a/contrib/mverify b/contrib/mverify index 24db88d..1624d49 100755 --- a/contrib/mverify +++ b/contrib/mverify @@ -3,6 +3,12 @@ # Needs gpg2 (for OpenPGP) and openssl (for SMIME). +if command -v gpg2 >/dev/null; then + GPG=gpg2 +else + GPG=gpg +fi + [ "$#" -eq 0 ] && set -- . mshow -t "$1" | DOS2UNIX='/ $/!s/$/ /' awk -v "msg=$1" ' @@ -14,7 +20,7 @@ signed && content && !signature && indent == si+2 { signature = 0+$1; type = $2 function q(a) { gsub("\\47", "\47\\\47\47", a); return "\47"a"\47" } END { if (type == "" && plain) { // guess plain text armored signature - exit(system("mshow -r " q(msg) " | gpg2 --verify")); + exit(system("mshow -r " q(msg) " | '$GPG' --verify")); } else if (type == "") { print("No signature found.") exit(100) @@ -22,7 +28,7 @@ END { exit(system("mshow -r -O " q(msg) " " q(content) \ " | sed $DOS2UNIX | " \ " { mshow -O " q(msg) " " q(signature) \ - " | gpg2 --verify - /dev/fd/3; } 3<&0")) + " | '$GPG' --verify - /dev/fd/3; } 3<&0")) } else if (type == "application/pkcs7-signature") { exit(system("mshow -r -O " q(msg) " " q(signed) \ " | openssl smime -verify")) -- cgit 1.4.1