From 7c1da4d16873b03890490e9fbef18d0f27e56c79 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 1 Jun 2019 22:13:06 -0400 Subject: [PATCH] compat for PASSWORD_STORE_DIR --- bin/mw | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index c69a147..610b8c4 100755 --- a/bin/mw +++ b/bin/mw @@ -1,7 +1,8 @@ #!/bin/sh command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" -[ -r "$HOME/.password-store/.gpg-id" ] && - "$GPG" --list-secret-keys $(cat "$HOME/.password-store/.gpg-id") >/dev/null 2>&1 || { +[ -z ${PASSWORD_STORE_DIR+x} ] && 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 || { 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 }