diff options
| author | James Rowe <jnrowe@gmail.com> | 2020-11-08 20:26:19 +0000 |
|---|---|---|
| committer | Leah Neukirchen <leah@vuxu.org> | 2020-11-24 14:15:29 +0100 |
| commit | bc021c53b6d49032efab050a8f1f6b44804916ac (patch) | |
| tree | 36083dce74a32f8001e1d390920e715732ffae98 /contrib/mencrypt | |
| parent | 6a8543e3215f73cffe08230fe64b45a86fc15681 (diff) | |
| download | mblaze-bc021c53b6d49032efab050a8f1f6b44804916ac.tar.gz mblaze-bc021c53b6d49032efab050a8f1f6b44804916ac.tar.xz mblaze-bc021c53b6d49032efab050a8f1f6b44804916ac.zip | |
Allow gpg and gpg2 executables for gnupg interaction
Closes: #193 [via git-merge-pr]
Diffstat (limited to 'contrib/mencrypt')
| -rwxr-xr-x | contrib/mencrypt | 8 |
1 files changed, 7 insertions, 1 deletions
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" |