mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-09-01 09:41:44 +02:00
42491 based on 42000 (Andrei Shevchuk): factor ssh host completion for use for mosh and git
This commit is contained in:
parent
f1a52c23fa
commit
4977ec1398
5 changed files with 58 additions and 50 deletions
|
@ -1,5 +1,10 @@
|
|||
2018-03-23 Oliver Kiddle <okiddle@yahoo.co.uk>
|
||||
|
||||
* 42491 based on 42000 (Andrei Shevchuk):
|
||||
Completion/Unix/Command/_mosh, Completion/Unix/Command/_git,
|
||||
Completion/Unix/Command/_ssh, Completion/Unix/Type/_ssh_hosts:
|
||||
factor ssh host completion for use for mosh and git
|
||||
|
||||
* 42497 (tweaked c.f. 42498): Completion/Debian/Command/_apt:
|
||||
make completion after apt install work on local .deb files
|
||||
|
||||
|
|
|
@ -6892,10 +6892,6 @@ __git_tree_files () {
|
|||
|
||||
(( $+functions[__git_remote_repositories] )) ||
|
||||
__git_remote_repositories () {
|
||||
local service
|
||||
|
||||
service= _ssh
|
||||
|
||||
if compset -P '*:'; then
|
||||
_remote_files -/ -- ssh
|
||||
else
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#compdef mosh
|
||||
|
||||
local curcontext="$curcontext" state line
|
||||
local curcontext="$curcontext" state line expl ret=1
|
||||
local -a _comp_priv_prefix
|
||||
|
||||
_arguments -C \
|
||||
|
@ -15,12 +15,20 @@ _arguments -C \
|
|||
'--server[specify command to run server helper]:remote file:_files' \
|
||||
'--client[specify command to run client helper]:_command_names -e' \
|
||||
'1:remote host name:->userhost' \
|
||||
'*:::args:_normal' && return
|
||||
'*:::args:_normal' && ret=0
|
||||
|
||||
case $state in
|
||||
userhost)
|
||||
_hosts || _user_at_host && return
|
||||
if compset -P '*@'; then
|
||||
_wanted hosts expl 'remote host name' _ssh_hosts && ret=0
|
||||
elif compset -S '@*'; then
|
||||
_wanted users expl 'login name' _combination -s '[:@]' my-accounts users-hosts users -S '' && ret=0
|
||||
else
|
||||
_alternative \
|
||||
'hosts:remote host name:_ssh_hosts' \
|
||||
'users:login name:_combination -s "[:@]" my-accounts users-hosts users -qS@' && ret=0
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
return 1
|
||||
return ret
|
||||
|
|
|
@ -647,46 +647,4 @@ _ssh_users () {
|
|||
_combination -s '[:@]' my-accounts users-hosts users "$@"
|
||||
}
|
||||
|
||||
_ssh_hosts () {
|
||||
local -a config_hosts
|
||||
local config
|
||||
integer ind
|
||||
|
||||
# If users-hosts matches, we shouldn't complete anything else.
|
||||
if [[ "$IPREFIX" == *@ ]]; then
|
||||
_combination -s '[:@]' my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@" && return
|
||||
else
|
||||
_combination -s '[:@]' my-accounts users-hosts \
|
||||
${opt_args[-l]:+"users=${opt_args[-l]:q}"} hosts "$@" && return
|
||||
fi
|
||||
if (( ind = ${words[(I)-F]} )); then
|
||||
config=${~words[ind+1]} 2>/dev/null
|
||||
else
|
||||
config="$HOME/.ssh/config"
|
||||
fi
|
||||
if [[ -r $config ]]; then
|
||||
local key line host
|
||||
local -a lines=("${(@f)$(<"$config")}") 2>/dev/null
|
||||
while (($#lines)); do
|
||||
IFS=$'=\t ' read -r key line <<<"${lines[1]}"
|
||||
case "$key" in
|
||||
((#i)include)
|
||||
lines[1]=("${(@f)$(cd $HOME/.ssh; cat ${(z)~line})}") 2>/dev/null;;
|
||||
((#i)host(|name))
|
||||
for host in ${(z)line}; do
|
||||
case $host in
|
||||
(*[*?]*) ;;
|
||||
(*) config_hosts+=("$host") ;;
|
||||
esac
|
||||
done ;&
|
||||
(*) shift lines;;
|
||||
esac
|
||||
done
|
||||
if (( ${#config_hosts} )); then
|
||||
_wanted hosts expl 'remote host name' \
|
||||
compadd -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' "$@" $config_hosts
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
_ssh "$@"
|
||||
|
|
41
Completion/Unix/Type/_ssh_hosts
Normal file
41
Completion/Unix/Type/_ssh_hosts
Normal file
|
@ -0,0 +1,41 @@
|
|||
#autoload
|
||||
|
||||
local -a config_hosts
|
||||
local config
|
||||
integer ind
|
||||
|
||||
# If users-hosts matches, we shouldn't complete anything else.
|
||||
if [[ "$IPREFIX" == *@ ]]; then
|
||||
_combination -s '[:@]' my-accounts users-hosts "users=${IPREFIX/@}" hosts "$@" && return
|
||||
else
|
||||
_combination -s '[:@]' my-accounts users-hosts \
|
||||
${opt_args[-l]:+"users=${opt_args[-l]:q}"} hosts "$@" && return
|
||||
fi
|
||||
if (( ind = ${words[(I)-F]} )); then
|
||||
config=${~words[ind+1]} 2>/dev/null
|
||||
else
|
||||
config="$HOME/.ssh/config"
|
||||
fi
|
||||
if [[ -r $config ]]; then
|
||||
local key line host
|
||||
local -a lines=("${(@f)$(<"$config")}") 2>/dev/null
|
||||
while (($#lines)); do
|
||||
IFS=$'=\t ' read -r key line <<<"${lines[1]}"
|
||||
case "$key" in
|
||||
((#i)include)
|
||||
lines[1]=("${(@f)$(cd $HOME/.ssh; cat ${(z)~line})}") 2>/dev/null;;
|
||||
((#i)host(|name))
|
||||
for host in ${(z)line}; do
|
||||
case $host in
|
||||
(*[*?]*) ;;
|
||||
(*) config_hosts+=("$host") ;;
|
||||
esac
|
||||
done ;&
|
||||
(*) shift lines;;
|
||||
esac
|
||||
done
|
||||
if (( ${#config_hosts} )); then
|
||||
_wanted hosts expl 'remote host name' \
|
||||
compadd -M 'm:{a-zA-Z}={A-Za-z} r:|.=* r:|=*' "$@" $config_hosts
|
||||
fi
|
||||
fi
|
Loading…
Reference in a new issue