From 37c91057f78542e8970cf7698c0c1588153c30f2 Mon Sep 17 00:00:00 2001
From: Aisha Tammy <floss@bsd.ac>
Date: Fri, 31 Dec 2021 22:55:01 +0000
Subject: [PATCH 1/2] add GPG WKS publishing functionality

Signed-off-by: Aisha Tammy <floss@bsd.ac>
---
 bin/mw | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/mw b/bin/mw
index d3129e7..fee8974 100755
--- a/bin/mw
+++ b/bin/mw
@@ -108,6 +108,8 @@ set trash = "+Trash"
 set record = "+Sent"
 $extra
 $synccmd
+macro index \eg \"<enter-command>unset wait_key<enter><shell-escape>gpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; /usr/local/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\"  \"publish GPG key to WKS provider\"
+macro index \eh \"<pipe-message>/usr/local/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\" \"confirm GPG publication\"
 " > "$accdir/$fulladdr.muttrc"
 
 	[ ! -f "$muttrc" ] && echo "# vim: filetype=neomuttrc" > "$muttrc"

From a82a86c310bbe2c3a71ff4da3b9ed635fed4e06d Mon Sep 17 00:00:00 2001
From: Aisha Tammy <floss@bsd.ac>
Date: Mon, 10 Jan 2022 20:06:52 +0000
Subject: [PATCH 2/2] change path of command to use prefix

Signed-off-by: Aisha Tammy <floss@bsd.ac>
---
 bin/mw | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mw b/bin/mw
index fee8974..d2a67d7 100755
--- a/bin/mw
+++ b/bin/mw
@@ -108,8 +108,8 @@ set trash = "+Trash"
 set record = "+Sent"
 $extra
 $synccmd
-macro index \eg \"<enter-command>unset wait_key<enter><shell-escape>gpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; /usr/local/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\"  \"publish GPG key to WKS provider\"
-macro index \eh \"<pipe-message>/usr/local/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\" \"confirm GPG publication\"
+macro index \eg \"<enter-command>unset wait_key<enter><shell-escape>gpg --list-secret-keys; printf 'Enter email ID of user to publish: '; read eID; printf 'Enter fingerprint of GPG key to publish: '; read eFGPT; $prefix/libexec/gpg-wks-client --create \\\$eFGPT \\\$eID | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\"  \"publish GPG key to WKS provider\"
+macro index \eh \"<pipe-message>$prefix/libexec/gpg-wks-client --receive | msmtp --read-envelope-from --read-recipients -a $fulladdr<enter>\" \"confirm GPG publication\"
 " > "$accdir/$fulladdr.muttrc"
 
 	[ ! -f "$muttrc" ] && echo "# vim: filetype=neomuttrc" > "$muttrc"