71d94206370c258383beddfa6d3122524c26d8e8

Author
Daniel Hahler <git@thequod.de>
Committer
Daniel Hahler <git@thequod.de>
Date

Message

Use zsh's default for ':completion:*:hosts'

The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009).

The best option appears to be using zsh's default configuration for
':completion:*:hosts'.

While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2) does not state why.

Diff

 1diff --git a/lib/completion.zsh b/lib/completion.zsh
 2index e0cdcf626bfaf6250818f983e2bc954ec2fb6f53..6e18e9c824530824bbfccecbeaad363de1b53183 100644
 3--- a/lib/completion.zsh
 4+++ b/lib/completion.zsh
 5@@ -31,22 +31,6 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm
 6 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 7 cdpath=(.)
 8 
 9-# use /etc/hosts and known_hosts for hostname completion
10-[ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
11-[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
12-[ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
13-[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
14-hosts=(
15-  "$_ssh_config[@]"
16-  "$_global_ssh_hosts[@]"
17-  "$_ssh_hosts[@]"
18-  "$_etc_hosts[@]"
19-  "$HOST"
20-  localhost
21-)
22-zstyle ':completion:*:hosts' hosts $hosts
23-zstyle ':completion:*' users off
24-
25 # Use caching so that commands like apt and dpkg complete are useable
26 zstyle ':completion::complete:*' use-cache 1
27 zstyle ':completion::complete:*' cache-path $ZSH/cache/