summaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorDavid Gray <yargevad+github@gmail.com>2019-12-05 13:42:45 -0700
committerJunegunn Choi <junegunn.c@gmail.com>2019-12-06 10:14:15 +0900
commit77cb906dfe3d5228cc045d1e8a0c2678a3f35d30 (patch)
treebca2d24e85d06c899cf9ca54df9653070d786ba0 /shell
parenta59e846f743cfd79b6202b1335e7327d86fb768e (diff)
[completion] Add support for HostName lines in ~/.ssh/config (#1785)
Close #1783
Diffstat (limited to 'shell')
-rw-r--r--shell/completion.bash2
-rw-r--r--shell/completion.zsh2
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/completion.bash b/shell/completion.bash
index 4ff7b784..effbf0fd 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 '^host ' | 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\)\? ' | command grep -v '[*?]' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \
<(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 c7be8777..a668e2c1 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 '^host ' | 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\)\? ' | command grep -v '[*?]' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}') \
<(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