From e9fb9ca79661a62f35b5371347220f0fe022aab9 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 10 Jan 2019 16:53:47 +0100
Subject: contrib/mencrypt: use default key for From:

---
 contrib/mencrypt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/contrib/mencrypt b/contrib/mencrypt
index 12ef28c..438ca19 100755
--- a/contrib/mencrypt
+++ b/contrib/mencrypt
@@ -5,14 +5,17 @@
 
 IFS='
 '
-FLAGS=$(mhdr -d -A -h from:to:cc:bcc: "$1" |sort -u |sed 's/^/--recipient=/')
+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"
 
 TMPD=$(mktemp -d -t mencrypt.XXXXXX)
 trap "rm -rf '$TMPD'" INT TERM EXIT
 
 awk '/^$/,0' "$1" |
 	mmime |
-	gpg --armor --encrypt --sign $FLAGS -o $TMPD/msg.asc ||
+	gpg2 $key --armor --encrypt --sign $FLAGS -o $TMPD/msg.asc ||
 	exit $?
 
 printf 'Version: 1\n' >$TMPD/version
-- 
cgit 1.4.1