summaryrefslogtreecommitdiffstats
path: root/completions/ssh-copy-id
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:03:19 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 01:03:19 +0000
commit6c09f2a45c5541e9c207d14fc7aa21a4a0066bde (patch)
tree0221189d367bf661f6f9493c4f17a03f0dd4b7d2 /completions/ssh-copy-id
parentReleasing progress-linux version 1:2.11-8~progress7.99u1. (diff)
downloadbash-completion-6c09f2a45c5541e9c207d14fc7aa21a4a0066bde.tar.xz
bash-completion-6c09f2a45c5541e9c207d14fc7aa21a4a0066bde.zip
Merging upstream version 1:2.12.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'completions/ssh-copy-id')
-rw-r--r--completions/ssh-copy-id22
1 files changed, 13 insertions, 9 deletions
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