diff options
| author | Henré Botha <henrebotha@gmail.com> | 2019-12-06 09:58:53 +0100 |
|---|---|---|
| committer | Junegunn Choi <junegunn.c@gmail.com> | 2019-12-06 17:58:53 +0900 |
| commit | 5e42b1c9f8f61c3dd6165c1a9a8321e865a06601 (patch) | |
| tree | 5b5a09452aee7cd050e0412895b172c1d07a5a52 /shell | |
| parent | 9d842630c931ae08f6f16f902d7b0ab42b10fda2 (diff) | |
[ssh completion] Skip only aliases matching * (#1788)
This commit fixes a bug where lines that declare multiple hostnames get
omitted from completion entirely if one of the hostnames matches *. For
example:
Host foo.com bar.dev baz.*
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/completion.bash | 2 | ||||
| -rw-r--r-- | shell/completion.zsh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index effbf0fd..7c661a23 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -244,7 +244,7 @@ _fzf_complete_telnet() { _fzf_complete_ssh() { _fzf_complete '+m' "$@" < <( - cat <(cat ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | command grep -v '[*?]' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \ + cat <(cat ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \ <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') | awk '{if (length($2) > 0) {print $2}}' | sort -u diff --git a/shell/completion.zsh b/shell/completion.zsh index a668e2c1..6aed69a4 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -115,7 +115,7 @@ _fzf_complete_telnet() { _fzf_complete_ssh() { _fzf_complete '+m' "$@" < <( setopt localoptions nonomatch - command cat <(cat ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | command grep -v '[*?]' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \ + command cat <(cat ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \ <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ <(command grep -v '^\s*\(#\|$\)' /etc/hosts | command grep -Fv '0.0.0.0') | awk '{if (length($2) > 0) {print $2}}' | sort -u |