From 533ae3bae1e20f709d5319a039300eacacda7160 Mon Sep 17 00:00:00 2001
From: Hugues <hugues@prunelle.(none)>
Date: Mon, 17 Mar 2008 00:29:22 +0100
Subject: Don't source the keychain when we are on a sudo shell.

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

(limited to '10_Environment.zsh')

diff --git a/10_Environment.zsh b/10_Environment.zsh
index e2b15df..52d72f5 100644
--- a/10_Environment.zsh
+++ b/10_Environment.zsh
@@ -17,14 +17,12 @@
 ##
 
 ## Agent de clefs SSH/GPG
-KEYCHAIN=~/.keychain/$(hostname)-sh
-if cmd_exists keychain 
+if [ "$SUDO_USER" = "" ]
 then
+	KEYCHAIN=~/.keychain/$(hostname)-sh
+	cmd_exists keychain && keychain --quiet
 	[ -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 
-- 
cgit v1.2.3