diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2010-08-19 10:38:10 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2010-08-19 10:38:10 +0200 |
| commit | 02df6c7f9f5a909895945fbccff481d4a52498b9 (patch) | |
| tree | 7c19033276906b17f661095adcc0f5040af58fb5 | |
| parent | def9b507a88b8823ef7cdf6826a20dc5cbf95cf9 (diff) | |
| parent | 0a8cdd4cc006e0241c887da10132853f167d4384 (diff) | |
Merge remote branch 'origin/master'
| -rw-r--r-- | 10_Environment.zsh | 3 | ||||
| -rw-r--r-- | 12_Prompts.zsh | 3 | ||||
| -rw-r--r-- | net:sweethome/Environment.zsh.gpg | bin | 393 -> 0 bytes | |||
| -rw-r--r-- | zshrc | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/10_Environment.zsh b/10_Environment.zsh index e2d7a62..99b0d19 100644 --- a/10_Environment.zsh +++ b/10_Environment.zsh @@ -18,9 +18,6 @@ export SHELL=`which zsh` -## Agent de clefs SSH/GPG -KEYCHAIN=~/.keychain/$(hostname)-sh - ## Colors autoload colors && colors diff --git a/12_Prompts.zsh b/12_Prompts.zsh index 0462fac..0819595 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -108,9 +108,6 @@ update_prompt_elements() [ "$DEBUG" = "yes" ] && echo -n " Agents..." # GPG/SSH agents AGENTS="" - [ -r "${KEYCHAIN}" ] && source ${KEYCHAIN} - [ -r "${KEYCHAIN}-gpg" ] && source ${KEYCHAIN}-gpg - local _is_multibyte_compliant if ( echo ${(k)options} | grep "multibyte" >/dev/null ) && [ "$options[multibyte]" = "on" ] diff --git a/net:sweethome/Environment.zsh.gpg b/net:sweethome/Environment.zsh.gpg Binary files differdeleted file mode 100644 index 3c2cdc1..0000000 --- a/net:sweethome/Environment.zsh.gpg +++ /dev/null @@ -39,6 +39,12 @@ DOMAIN=${DOMAIN:-$(hostname -d 2>&-)} DOMAIN=${DOMAIN:-$(hostname -y 2>&-)} [ "$DOMAIN" = "" -o "$DOMAIN" = "localdomain" -o "$DOMAIN" = "(none)" ] && DOMAIN=$(grep "^search " /etc/resolv.conf | cut -d' ' -f2) +## Agent de clefs SSH/GPG +KEYCHAIN=~/.keychain/$(hostname)-sh +[ -r "${KEYCHAIN}" ] && source ${KEYCHAIN} +[ -r "${KEYCHAIN}-gpg" ] && source ${KEYCHAIN}-gpg + + DEBUG=${DEBUG:-no} export USER HOST DOMAIN UID @@ -82,7 +88,7 @@ if [ -d $ZDOTDIR ]; then if test -f $specific_script.gpg then [ "$DEBUG" = "yes" ] && echo -n "$i/${${specific_script:t:r}/??_/} [CRYPTED]... "; - eval $(gpg --decrypt $specific_script.gpg) + eval $(gpg --quiet --decrypt $specific_script.gpg) [ "$DEBUG" = "yes" ] && echo fi done |