From bc021c53b6d49032efab050a8f1f6b44804916ac Mon Sep 17 00:00:00 2001
From: James Rowe <jnrowe@gmail.com>
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/mencrypt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'contrib/mencrypt')

diff --git a/contrib/mencrypt b/contrib/mencrypt
index 10077d6..71d5bac 100755
--- a/contrib/mencrypt
+++ b/contrib/mencrypt
@@ -10,12 +10,18 @@ FLAGS=$(maddr -a -h from:to:cc:bcc: "$1" |sort -u |sed 's/^/--recipient=/')
 FROM=$(maddr -a -h from "$1" | sed 1q)
 [ "$FROM" ] && key="--default-key=$FROM"
 
+if command -v gpg2 >/dev/null; then
+	GPG=gpg2
+else
+	GPG=gpg
+fi
+
 TMPD=$(mktemp -d -t mencrypt.XXXXXX)
 trap "rm -rf '$TMPD'" INT TERM EXIT
 
 awk '/^$/,0' "$1" |
 	mmime |
-	gpg2 "$key" --armor --encrypt --sign $FLAGS -o "$TMPD/msg.asc" ||
+	$GPG "$key" --armor --encrypt --sign $FLAGS -o "$TMPD/msg.asc" ||
 	exit $?
 
 printf 'Version: 1\n' >"$TMPD/version"
-- 
cgit 1.4.1