Skip to content

Commit 898926c

Browse files
committed
refactor(ssh): _comp_xfunc_ssh_query main command convention
1 parent 5c1d270 commit 898926c

File tree

1 file changed

+21
-11
lines changed

1 file changed

+21
-11
lines changed

completions/ssh

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
_comp_cmd_ssh__queries()
44
{
5-
local queries=$(_comp_xfunc_ssh_query "$1" help)
5+
local queries=$(_comp_cmd_ssh__query "$1" help)
66
[[ $queries ]] || queries="cipher cipher-auth mac kex key key-cert
77
key-plain key-sig protocol-version compression sig ciphers macs
88
kexalgorithms pubkeyacceptedkeytypes hostkeyalgorithms
@@ -14,14 +14,24 @@ _comp_cmd_ssh__queries()
1414
# TODO:API:rework to use vars rather than outputting
1515
_comp_xfunc_ssh_query()
1616
{
17-
${1:-ssh} -Q "$2" 2>/dev/null
17+
_comp_cmd_ssh__query ssh "$1"
1818
}
1919

20-
_comp_deprecate_func 2.12 _ssh_query _comp_xfunc_ssh_query
20+
# @deprecated 2.12 use _comp_xfunc_ssh_query
21+
_ssh_query()
22+
{
23+
_comp_cmd_ssh__query "${1:-ssh}" "$2"
24+
}
25+
26+
# TODO:API:rework to use vars rather than outputting
27+
_comp_cmd_ssh__query()
28+
{
29+
"$1" -Q "$2" 2>/dev/null
30+
}
2131

2232
_comp_cmd_ssh__ciphers()
2333
{
24-
local ciphers=$(_comp_xfunc_ssh_query "$1" cipher)
34+
local ciphers=$(_comp_cmd_ssh__query "$1" cipher)
2535
[[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
2636
aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
2737
blowfish-cbc cast128-cbc"
@@ -30,7 +40,7 @@ _comp_cmd_ssh__ciphers()
3040

3141
_comp_cmd_ssh__macs()
3242
{
33-
local macs=$(_comp_xfunc_ssh_query "$1" mac)
43+
local macs=$(_comp_cmd_ssh__query "$1" mac)
3444
[[ $macs ]] || macs="hmac-md5 hmac-sha1 [email protected] hmac-ripemd160
3545
hmac-sha1-96 hmac-md5-96"
3646
_comp_compgen -a -- -W "$macs"
@@ -70,7 +80,7 @@ _comp_xfunc_ssh_options()
7080
GSSAPIKeyExchange GSSAPIRenewalForcesRekey GSSAPIServerIdentity
7181
GSSAPITrustDns PubkeyAcceptedKeyTypes SmartcardDevice UsePrivilegedPort
7282
)
73-
local protocols=$(_comp_xfunc_ssh_query "${1:-ssh}" protocol-version)
83+
local protocols=$(_comp_cmd_ssh__query ssh protocol-version)
7484
if [[ ! $protocols || $protocols == *1* ]]; then
7585
opts+=(Cipher CompressionLevel Protocol RhostsRSAAuthentication
7686
RSAAuthentication)
@@ -135,7 +145,7 @@ _comp_cmd_ssh__suboption()
135145
_comp_compgen_filedir
136146
;;
137147
casignaturealgorithms)
138-
COMPREPLY=($(compgen -W '$(_comp_xfunc_ssh_query "$1" sig)' -- "$cur"))
148+
COMPREPLY=($(compgen -W '$(_comp_cmd_ssh__query "$1" sig)' -- "$cur"))
139149
;;
140150
cipher)
141151
_comp_compgen -- -W 'blowfish des 3des'
@@ -157,10 +167,10 @@ _comp_cmd_ssh__suboption()
157167
cs{0..7} ef lowdelay throughput reliability'
158168
;;
159169
hostbasedkeytypes | hostkeyalgorithms)
160-
COMPREPLY=($(compgen -W '$(_comp_xfunc_ssh_query "$1" key)' -- "$cur"))
170+
COMPREPLY=($(compgen -W '$(_comp_cmd_ssh__query "$1" key)' -- "$cur"))
161171
;;
162172
kexalgorithms)
163-
COMPREPLY=($(compgen -W '$(_comp_xfunc_ssh_query "$1" kex)' -- "$cur"))
173+
COMPREPLY=($(compgen -W '$(_comp_cmd_ssh__query "$1" kex)' -- "$cur"))
164174
;;
165175
loglevel)
166176
_comp_compgen -- -W 'QUIET FATAL ERROR INFO VERBOSE DEBUG{,1,2,3}'
@@ -176,7 +186,7 @@ _comp_cmd_ssh__suboption()
176186
keyboard-interactive password' -- "$cur"))
177187
;;
178188
protocol)
179-
local protocols=($(_comp_xfunc_ssh_query "$1" protocol-version))
189+
local protocols=($(_comp_cmd_ssh__query "$1" protocol-version))
180190
[[ $protocols ]] || protocols=(1 2)
181191
if ((${#protocols[@]} > 1)); then
182192
_comp_compgen -- -W '"${protocols[@]}"'
@@ -189,7 +199,7 @@ _comp_cmd_ssh__suboption()
189199
_comp_compgen -- -c
190200
;;
191201
pubkeyacceptedalgorithms | pubkeyacceptedkeytypes)
192-
COMPREPLY=($(compgen -W '$(_comp_xfunc_ssh_query "$1" key)' -- "$cur"))
202+
COMPREPLY=($(compgen -W '$(_comp_cmd_ssh__query "$1" key)' -- "$cur"))
193203
;;
194204
requesttty)
195205
_comp_compgen -- -W 'no yes force auto'

0 commit comments

Comments
 (0)