1 files changed, 4 insertions, 3 deletions

@@ -1,10 +1,11 @@
 # start the ssh-agent
 
 # use keychain(1), if available
-if type keychain >/dev/null 2>&1; then
+if execp keychain
+then
         # Save directory name in a variable (for ease of maintenance)
-        export KEYCHAIN_HOME="$XDG_RUNTIME_DIR/keychain"
-        eval $(keychain --eval --dir "$KEYCHAIN_HOME" --agents ssh 2>/dev/null)
+        export KEYCHAIN_HOME="$XDG_RUNTIME_DIR/"
+        eval $(keychain --quiet --eval --dir "$KEYCHAIN_HOME" --agents ssh)
 else
         eval $(ssh-agent -s)
 fi