Only call keychain(1) when shell is interactive

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index b65ff999af1d3101596266a03566331fa24e0565..e3a45dc8196db3f71540e596a9a601ed79b3a501 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -12,6 +12,10 @@ BASHRCREAD="true"
 # Interactive shell?
 [ "$PS1" ] || return
 
+# Initialize keychain(1) ssh-agent and gpg-agent helper
+type keychain >/dev/null 2>&1 \
+       && eval `keychain --agents ssh --eval --quick --quiet`
+
 # Common command aliases (1/2)
 alias ".."="cd .."
 alias "ls"="ls -F"
@@ -184,6 +188,6 @@ esac
 # Source local files, if readable
 [ -r "/etc/bashrc.local" ] && source /etc/bashrc.local
 [ -r "/etc/bash.bashrc.local" ] && source /etc/bash.bashrc.local
-[ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
+[ -r "/var/lib/$HOSTNAME/bash.bashrc" ] && source /var/lib/$HOSTNAME/bash.bashrc
 
 # -eof-