diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2009-06-05 00:14:16 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2009-06-05 00:14:44 +0200 |
| commit | bcd0823d15c93d0c6ec404860bb45aa8b4e6d283 (patch) | |
| tree | 3b350e6609a43b731b1ea0bf2b9b5394ea58910c | |
| parent | 7e6dee86f24c41338c9294dbd5f83ce8155b6d96 (diff) | |
[Prompts] better multibyte on/off managment for ssh/gpg agents
| -rw-r--r-- | 12_Prompts.zsh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/12_Prompts.zsh b/12_Prompts.zsh index bdbb55a..68bcc5f 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -115,11 +115,11 @@ update_prompt() SSH_AGENT_KEYLIST="$( ssh-add -l | grep "^[[:digit:]]\+ \([[:digit:]a-f]\{2\}:\)\{15\}[[:digit:]a-f]\{2\} .* (.*)$" )" local _is_multibyte_compliant - if ( echo ${(k)options} | grep "multibyte" >/dev/null && [ "$options[multibyte]" = "on" ] ) + if ( echo ${(k)options} | grep "multibyte" >/dev/null ) && [ "$options[multibyte]" = "on" ] then - _is_multibyte_compliant=1 + _is_multibyte_compliant="yes it is !" else - _is_multibyte_compliant=0 + _is_multibyte_compliant="" fi # Check if it is a forwarded agent @@ -129,20 +129,20 @@ update_prompt() if [ "$SSH_AGENT_KEYLIST" != "" ] then AGENTCOLOR="has_keys" - AGENTCHAR=${AGENT_WITH_KEYS:-$( [ _is_multibyte_compliant ] && echo "★" || echo "§" )} + AGENTCHAR=${AGENT_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "★" || echo "S" )} else AGENTCOLOR="empty" - AGENTCHAR=${AGENT_EMPTY:-$( [ _is_multibyte_compliant ] && echo "☆" || echo "§" )} + AGENTCHAR=${AGENT_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "☆" || echo "S" )} fi else # That's a forwarded agent if [ "$SSH_AGENT_KEYLIST" != "" ] then AGENTCOLOR="has_keys" - AGENTCHAR=${AGENT_SOCK_WITH_KEYS:-$( [ _is_multibyte_compliant ] && echo "●" || echo "@" )} + AGENTCHAR=${AGENT_SOCK_WITH_KEYS:-$( [ $_is_multibyte_compliant ] && echo "●" || echo "@" )} else AGENTCOLOR="empty" - AGENTCHAR=${AGENT_SOCK_EMPTY:-$( [ _is_multibyte_compliant ] && echo "○" || echo "@" )} + AGENTCHAR=${AGENT_SOCK_EMPTY:-$( [ $_is_multibyte_compliant ] && echo "○" || echo "@" )} fi fi @@ -155,7 +155,7 @@ update_prompt() if [ "`strings /proc/$GPG_AGENT_PID/cmdline | head -n1`" = "gpg-agent" ] then AGENTCOLOR="has_keys" - AGENTS=$AGENTS$C_$agent_colors[$AGENTCOLOR]$_C${GPG_AGENT_RUNNING:-$( [ _is_multibyte_compliant ] && echo "☆" || echo "G" )} + AGENTS=$AGENTS$C_$agent_colors[$AGENTCOLOR]$_C${GPG_AGENT_RUNNING:-$( [ $_is_multibyte_compliant ] && echo "☆" || echo "G" )} fi fi AGENTS=${AGENTS:+$C_$prompt_colors[bar]$_C"-"$AGENTS} |