From d33c89355584643a25a2823b61d585f6d3a3e971 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 4 May 2019 09:50:15 -0400 Subject: [PATCH] gpg double check --- bin/mw | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 9345d3c..d6e46f3 100755 --- a/bin/mw +++ b/bin/mw @@ -1,5 +1,6 @@ #!/bin/sh -[ ! -f "$HOME/.password-store/.gpg-id" ] && 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 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 ! command -v mbsync >/dev/null && printf "\`mbsync\` must be installed to run mutt-wizard.\\n" && exit muttdir="$HOME/.config/mutt" # Main mutt config location accdir="$muttdir/accounts" # Directory for account settings