diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-01-30 15:34:48 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-01-30 15:34:48 +0100 |
| commit | 87b805fedb4b677fce27f87155d0be02f1bd62e6 (patch) | |
| tree | 7bd6cbe87e3089ba6a08546265e76bbccbbcbd08 /10_Environment.zsh | |
| parent | edd56a36739a0d1a4bd7a255c9d184818bcc42ff (diff) | |
| parent | 9fdd7da7cae3db0e278c0ad1f62a84e72389a9a2 (diff) | |
Merge commit 'origin/master'
Diffstat (limited to '10_Environment.zsh')
| -rw-r--r-- | 10_Environment.zsh | 19 |
1 files changed, 5 insertions, 14 deletions
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 |