From aaa188ce722c7da4a71112b0b0f6ef441a9bdceb Mon Sep 17 00:00:00 2001 From: "Stanko K.R" Date: Sat, 4 May 2019 22:47:20 +0200 Subject: [PATCH] Relax pass store check Checking for a secret key with format `` may not work for people that store key IDs in .gpg-id. Removing the `<` and `>` makes it work for both beople that use emails and people that use IDs. --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 0010a67..7484c9f 100755 --- a/bin/mw +++ b/bin/mw @@ -1,6 +1,6 @@ #!/bin/sh command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" -! "$GPG" --list-secret-keys "<$(cat "$HOME/.password-store/.gpg-id")>" >/dev/null 2>&1 && printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`gpg --full-gen-key\` first.\\n" && exit +! "$GPG" --list-secret-keys $(cat "$HOME/.password-store/.gpg-id") >/dev/null 2>&1 && printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`gpg --full-gen-key\` first.\\n" && exit ! command -v mbsync >/dev/null && printf "\`mbsync\` must be installed to run mutt-wizard.\\n" && exit if [[ "$OSTYPE" == "darwin"* ]]; then