From 1ae8b764ed573c01ef11ff06feed602eedf6a69e Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Fri, 14 Mar 2008 21:42:28 +0100 Subject: Keychain managment. That should be better like this.. --- 10_Environment.zsh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to '10_Environment.zsh') 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 -- cgit v1.2.3