From c4e84ff816fc481104620985b608357dcc723b3f Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Thu, 29 Jan 2009 16:17:07 +0100
Subject: [KEYCHAIN] startup script

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

(limited to '10_Environment.zsh')

diff --git a/10_Environment.zsh b/10_Environment.zsh
index 378dff7..303cd55 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -21,10 +21,20 @@ export SHELL=`which zsh`
 ## Agent de clefs SSH/GPG
 if [ "$SUDO_USER" = "" ]
 then
-	KEYCHAIN=~/.keychain/$(hostname)-sh
-	cmd_exists keychain && keychain --quiet
-	[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-	[ -f ${KEYCHAIN}-gpg ] && source ${KEYCHAIN}-gpg
+	if cmd_exists keychain
+	then
+		if [ -f ~/.keychain/startup.zsh ]
+		then
+			~/.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
 fi
 
 ## Colors 
-- 
cgit v1.2.3


From f2d5d2805b68a99b9df6670e3585927ea9320257 Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Fri, 30 Jan 2009 10:46:29 +0100
Subject: [KEYCHAIN] source file instead of executing it..

---
 10_Environment.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '10_Environment.zsh')

diff --git a/10_Environment.zsh b/10_Environment.zsh
index 303cd55..9e5a1f9 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -25,7 +25,7 @@ then
 	then
 		if [ -f ~/.keychain/startup.zsh ]
 		then
-			~/.keychain/startup.zsh --quiet
+			source ~/.keychain/startup.zsh --quiet
 		else
 			KEYCHAIN=~/.keychain/$(hostname)-sh
 			[ -f ${KEYCHAIN}     ] && source ${KEYCHAIN}
-- 
cgit v1.2.3