From a1cdd797ca0f79b7641c5478940e3fa7c109e547 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Fri, 30 Jan 2009 11:25:56 +0100
Subject: [KEYCHAIN] just source the env files, don't startup at every shell...

---
 10_Environment.zsh | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to '10_Environment.zsh')

diff --git a/10_Environment.zsh b/10_Environment.zsh
index 9e5a1f9..53209ff 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -21,20 +21,11 @@ export SHELL=`which zsh`
 ## Agent de clefs SSH/GPG
 if [ "$SUDO_USER" = "" ]
 then
-	if cmd_exists keychain
-	then
-		if [ -f ~/.keychain/startup.zsh ]
-		then
-			source ~/.keychain/startup.zsh --quiet
-		else
-			KEYCHAIN=~/.keychain/$(hostname)-sh
-			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-			[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
-			cmd_exists keychain && keychain --quiet --quick --inherit any --stop others
-			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-			[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
-		fi
-	fi
+	KEYCHAIN=~/.keychain/$(hostname)-sh
+	for file in $(find $KEYCHAIN:h -name "$(hostname)-sh" -o -name "$(hostname)-sh-*")
+	do
+		source $file
+	done
 fi
 
 ## Colors 
-- 
cgit v1.2.3