jaromail

commit 307290726ef418a1b7f48ea7f0e89edad56fd3b1
parent 4b5805fec25d9ad683b0d522b34cd0d61a31482b
Author: Jaromil <jaromil@dyne.org>
Date:   Mon, 21 Nov 2016 19:23:46 +0100

fix to pass detection when uninitialised

Diffstat:
M
src/jaro
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/jaro b/src/jaro
@@ -356,8 +356,14 @@ check_bin() {
 
     # check for pass, else fallback
     if isfound pass; then
-        export PASSWORD_STORE_DIR=$JAROMAILDIR/.pass
-        PASS=1
+        export PASSWORD_STORE_DIR=$MAILDIRS/.pass
+		[[ -d $PASSWORD_STORE_DIR ]] || {
+			error "the 'pass' keyring is found but not initialised"
+			error "run 'pass init your-gpg-id' or uninstall it to use other keyrings"
+			return 1 }
+		PASS=1
+		}
+
     # check if secret-tool is present else fallback to gnome-keyring
     elif isfound secret-tool; then
         SECRET_TOOL=1