summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElvan Owen <elvanowen95@gmail.com>2020-10-06 20:53:08 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2020-10-06 20:54:42 +0900
commit2986e64a49f8b1b32d3090aee2e178fae60ce201 (patch)
treeef3774a79028dcddf0a974ba51165c6f6924142c
parent1d8bd11b67e74471c9c75a4dd2ccb041071ae1f8 (diff)
[completion] Make host completion handle source files without EOL
-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 3f6161df..c88d650f 100644
--- a/shell/completion.bash
+++ b/shell/completion.bash
@@ -272,7 +272,7 @@ _fzf_proc_completion_post() {
_fzf_host_completion() {
_fzf_complete +m -- "$@" < <(
- 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 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 | 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 2096ad4e..11adc81e 100644
--- a/shell/completion.zsh
+++ b/shell/completion.zsh
@@ -225,7 +225,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\)\? ' | awk '{for (i = 2; i <= NF; i++) print $1 " " $i}' | command grep -v '[*?]') \
+ 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 | 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