diff options
| author | akdevservices <29972256+akdevservices@users.noreply.github.com> | 2023-10-29 03:05:30 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-29 09:05:30 +0900 |
| commit | a62fe3df6f715630f0fd6ee6879573e107bc45a0 (patch) | |
| tree | 5f94c94e318c1037abe4be8172f40d646358c879 | |
| parent | 7701244a085ec717fdc2bd43600ab62ddb4bd21b (diff) | |
[completion] Handle all hostaliases in /etc/hosts (#3495)
* Fix #3488
* Handle inline comments in hosts file
| -rw-r--r-- | shell/completion.bash | 4 | ||||
| -rw-r--r-- | shell/completion.zsh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/shell/completion.bash b/shell/completion.bash index 37a37948..db84e06a 100644 --- a/shell/completion.bash +++ b/shell/completion.bash @@ -423,8 +423,8 @@ if ! declare -F __fzf_list_hosts > /dev/null; then __fzf_list_hosts() { command cat <(command tail -n +1 ~/.ssh/config ~/.ssh/config.d/* /etc/ssh/ssh_config 2> /dev/null | command grep -i '^\s*host\(name\)\? ' | command awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?%]') \ <(command grep -oE '^[[a-z0-9.,:-]+' ~/.ssh/known_hosts 2> /dev/null | command tr ',' '\n' | command tr -d '[' | command awk '{ print $1 " " $1 }') \ - <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0') | - command awk '{if (length($2) > 0) {print $2}}' | command sort -u + <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0' | command sed 's/#.*//') | + command awk '{for (i = 2; i <= NF; i++) print $i}' | command sort -u } fi diff --git a/shell/completion.zsh b/shell/completion.zsh index c01bbb82..c4ba2c75 100644 --- a/shell/completion.zsh +++ b/shell/completion.zsh @@ -226,8 +226,8 @@ if ! declare -f __fzf_list_hosts > /dev/null; then setopt localoptions nonomatch command cat <(command tail -n +1 ~/.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 2> /dev/null | tr ',' '\n' | tr -d '[' | awk '{ print $1 " " $1 }') \ - <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0') | - awk '{if (length($2) > 0) {print $2}}' | sort -u + <(command grep -v '^\s*\(#\|$\)' /etc/hosts 2> /dev/null | command grep -Fv '0.0.0.0' | command sed 's/#.*//') | + awk '{for (i = 2; i <= NF; i++) print $i}' | sort -u } fi |