From 6c09f2a45c5541e9c207d14fc7aa21a4a0066bde Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 03:03:19 +0200 Subject: Merging upstream version 1:2.12.0. Signed-off-by: Daniel Baumann --- completions/ssh-copy-id | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'completions/ssh-copy-id') diff --git a/completions/ssh-copy-id b/completions/ssh-copy-id index f628194..52aa9d7 100644 --- a/completions/ssh-copy-id +++ b/completions/ssh-copy-id @@ -1,32 +1,36 @@ # ssh-copy-id(1) completion -*- shell-script -*- -_ssh_copy_id() +_comp_cmd_ssh_copy_id() { - local cur prev words cword - _init_completion || return + local cur prev words cword comp_args + _comp_initialize -- "$@" || return - _xfunc ssh _ssh_suboption_check "$1" && return + # Prefer `ssh` from same dir for resolving options, etc + local pathcmd + pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH + + _comp_compgen -x ssh suboption_check && return case $prev in -i) - _xfunc ssh _ssh_identityfile pub + _comp_compgen -x ssh identityfile pub return ;; -p) return ;; -o) - _xfunc ssh _ssh_options + _comp_compgen -x ssh options return ;; esac if [[ $cur == -* ]]; then - COMPREPLY=($(compgen -W '$(_parse_usage "$1" --help)' -- "$cur")) + _comp_compgen_usage -- --help else - _known_hosts_real -a -- "$cur" + _comp_compgen_known_hosts -a -- "$cur" fi } && - complete -F _ssh_copy_id ssh-copy-id + complete -F _comp_cmd_ssh_copy_id ssh-copy-id # ex: filetype=sh -- cgit v1.2.3