summaryrefslogtreecommitdiff
path: root/10_Environment.zsh
diff options
context:
space:
mode:
authorHugues Hiegel <hugues@hiegel.fr>2008-03-14 21:42:28 +0100
committerHugues Hiegel <hugues@hiegel.fr>2008-03-14 21:42:28 +0100
commit1ae8b764ed573c01ef11ff06feed602eedf6a69e (patch)
tree649082db8e047249bf545f05ea8d3d1ca5c9aafc /10_Environment.zsh
parent9088c1576c25eb8ab0e8ad466c1353bcfe4fbd39 (diff)
Keychain managment. That should be better like this..
Diffstat (limited to '10_Environment.zsh')
-rw-r--r--10_Environment.zsh13
1 files changed, 8 insertions, 5 deletions
diff --git a/10_Environment.zsh b/10_Environment.zsh
index 79b57b2..e2b15df 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -18,11 +18,14 @@
## Agent de clefs SSH/GPG
KEYCHAIN=~/.keychain/$(hostname)-sh
-#[ -f ${KEYCHAIN} ] && source ${KEYCHAIN}
-#[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
-#( ps fu | grep -v grep | grep $SSH_AGENT_PID 2>&- >&- ) || ( cmd_exists keychain && keychain --quiet --stop others --inherit any ) && \
-# [ -f ${KEYCHAIN} ] && source ${KEYCHAIN} ;\
-# [ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+if cmd_exists keychain
+then
+ [ -f ${KEYCHAIN} ] && source ${KEYCHAIN}
+ [ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+ ( ps fu | grep -v grep | grep $SSH_AGENT_PID 2>&- >&- ) || ( cmd_exists keychain && keychain --quiet --stop others --inherit any ) && \
+ [ -f ${KEYCHAIN} ] && source ${KEYCHAIN} ;\
+ [ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+fi
## Colors
autoload colors && colors