summaryrefslogtreecommitdiff
path: root/10_Environment.zsh
diff options
context:
space:
mode:
authorHugues <hugues@prunelle.(none)>2008-03-17 00:29:22 +0100
committerHugues <hugues@prunelle.(none)>2008-03-17 00:29:22 +0100
commit533ae3bae1e20f709d5319a039300eacacda7160 (patch)
tree8aa92c8e0fdc7b09c294b3a37f590a5853284144 /10_Environment.zsh
parent8f5d2d8558a3fddc71ff2b21f723b19d1443b09f (diff)
Don't source the keychain when we are on a sudo shell.
Diffstat (limited to '10_Environment.zsh')
-rw-r--r--10_Environment.zsh8
1 files changed, 3 insertions, 5 deletions
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