mutt-wizard

commit 0b9a9a3d7f2ad8394a1dd34464d14d2b4e225d68
parent c1bec4096930f25bdc02fd4181c65ab188ab7260
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Sun, 22 Aug 2021 09:10:54 -0400

Merge pull request #722 from pantosaur/master

password store with multiple private keys fix
Diffstat:
M
bin/mw
 | 
5
++---

1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/bin/mw b/bin/mw
@@ -29,8 +29,7 @@ done || { echo "CA Certificate not found. Please install one or link it to /etc/
 
 checkbasics() { command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2"
 	PASSWORD_STORE_DIR="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	[ -r "$PASSWORD_STORE_DIR/.gpg-id" ] &&
-	"$GPG" --list-secret-keys "$(cat "$PASSWORD_STORE_DIR/.gpg-id")" >/dev/null 2>&1 || {
+	[ -r "$PASSWORD_STORE_DIR/.gpg-id" ] || {
 	echo "First run \`pass init <yourgpgemail>\` to set up a password archive."
 	echo "(If you don't already have a GPG key pair, first run \`$GPG --full-generate-key\`.)"
        	exit 1 ;} ;}
@@ -213,7 +212,7 @@ askinfo() { \
 }
 
 createpass() { echo "$password" > "$PASSWORD_STORE_DIR/$fulladdr"
-	"$GPG" -qer "$(cat "$PASSWORD_STORE_DIR/.gpg-id")" "$PASSWORD_STORE_DIR/$fulladdr"
+  "$GPG" -qe $(printf -- " -r %s" $(cat "$PASSWORD_STORE_DIR/.gpg-id")) "$PASSWORD_STORE_DIR/$fulladdr"
 	rm -f "$PASSWORD_STORE_DIR/$fulladdr" ;}
 
 getpass() { while : ; do pass rm -f "$fulladdr" >/dev/null 2>&1