commit 3f9c00de69688248f56a7aa6bf0c2295c82efa78 parent bc3cceaf77cbf8bd87d7a6284ef37de8f8c9bca6 Author: Luke Smith <luke@lukesmith.xyz> Date: Wed, 15 May 2019 14:33:45 -0400 Merge pull request #205 from Kr1ss-XD/fix-pass-setup check if .gpg-id is in the pass store on startup Diffstat:
| M | bin/mw | | | 6 | +++++- |
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/bin/mw b/bin/mw @@ -1,6 +1,10 @@ #!/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 <yourgpgemail>\`.\\nIf you don't have a GPG public private key pair, run \`$GPG --full-gen-key\` first.\\n" && exit +[ -r "$HOME/.password-store/.gpg-id" ] && + "$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 <yourgpgemail>\`.\\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