summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2016-11-21 18:23:46 (GMT)
committer Jaromil <jaromil@dyne.org>2017-01-10 14:40:13 (GMT)
commit307290726ef418a1b7f48ea7f0e89edad56fd3b1 (patch)
treec742eafe583711c8551c012e341d0250d2141372
parent4b5805fec25d9ad683b0d522b34cd0d61a31482b (diff)
fix to pass detection when uninitialised
-rwxr-xr-xsrc/jaro10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/jaro b/src/jaro
index c08e133..9ccc071 100755
--- 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