X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=b369aca042240236e530155e23947a82163d3b84;hb=f3f1387761d36244009785d92ddf60dd98663d76;hp=22ed16228d1e26b47322bd34b041f544aa5d458d;hpb=27e32faa47e6006fba524870d042bdbe2ef6ab85;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 22ed162..b369aca 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -891,14 +891,21 @@ function grmlcomp () { fi # host completion + _etc_hosts=() + _ssh_config_hosts=() + _ssh_hosts=() if is42 ; then - [[ -r ~/.ssh/config ]] && _ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*}) || _ssh_config_hosts=() - [[ -r ~/.ssh/known_hosts ]] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() - [[ -r /etc/hosts ]] && [[ "$NOETCHOSTS" -eq 0 ]] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(grep -v '^0\.0\.0.\0\|^127\.0\.0\.1\|^::1 ' /etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=() - else - _ssh_config_hosts=() - _ssh_hosts=() - _etc_hosts=() + if [[ -r ~/.ssh/config ]] ; then + _ssh_config_hosts=(${${(s: :)${(ps:\t:)${${(@M)${(f)"$(<$HOME/.ssh/config)"}:#Host *}#Host }}}:#*[*?]*}) + fi + + if [[ -r ~/.ssh/known_hosts ]] ; then + _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) + fi + + if [[ -r /etc/hosts ]] && [[ "$NOETCHOSTS" -eq 0 ]] ; then + : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(grep -v '^0\.0\.0\.0\|^127\.0\.0\.1\|^::1 ' /etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} + fi fi local localname @@ -2678,8 +2685,8 @@ else fi # use ip from iproute2 with color support -if ip --color=auto addr show dev lo >/dev/null 2>&1; then - alias ip='command ip --color=auto' +if ip -color=auto addr show dev lo >/dev/null 2>&1; then + alias ip='command ip -color=auto' fi if [[ -r /proc/mdstat ]]; then