Skip to content

Commit f45b104

Browse files
akinomyogaakinomyoga
committed
refactor([s-z]*): remove -a for filedir
1 parent bd71426 commit f45b104

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+154
-152
lines changed

‎completions/sbcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _comp_cmd_sbcl()
1313
--sysinit --userinit --eval --noprint --disable-debugger
1414
--end-runtime-options --end-toplevel-options ' -- "$cur"))
1515
else
16-
_comp_compgen -a filedir
16+
_comp_compgen filedir
1717
fi
1818
} &&
1919
complete -F _comp_cmd_sbcl sbcl sbcl-mt

‎completions/sbopkg

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ _comp_cmd_sbopkg()
1616
return
1717
;;
1818
-f)
19-
_comp_compgen -a filedir
19+
_comp_compgen filedir
2020
return
2121
;;
2222
-d)
23-
_comp_compgen -a filedir -d
23+
_comp_compgen filedir -d
2424
return
2525
;;
2626
-V)

‎completions/screen

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ _comp_cmd_screen__sessions()
100100
return
101101
;;
102102
-*c)
103-
_comp_compgen -a filedir
103+
_comp_compgen filedir
104104
return
105105
;;
106106
-T)

‎completions/scrub

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ _comp_cmd_scrub()
1919
return
2020
;;
2121
--freespace | -${noargopts}X)
22-
_comp_compgen -a filedir -d
22+
_comp_compgen filedir -d
2323
return
2424
;;
2525
esac
@@ -32,7 +32,7 @@ _comp_cmd_scrub()
3232
return
3333
fi
3434

35-
_comp_compgen -a filedir
35+
_comp_compgen filedir
3636
} &&
3737
complete -F _comp_cmd_scrub scrub
3838

‎completions/sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ _comp_cmd_sh()
2929
local args ext=
3030
_count_args "" "@(-c|[-+]o)"
3131
((args == 1)) && ext="sh"
32-
_comp_compgen -a filedir $ext
32+
_comp_compgen filedir $ext
3333
} &&
3434
complete -F _comp_cmd_sh sh
3535

‎completions/sha256sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ _comp_cmd_sha256sum()
2424
local opt
2525
for opt in "${words[@]}"; do
2626
if [[ $opt == -@(c|-check) ]]; then
27-
_comp_compgen -a filedir "$sumtype"
27+
_comp_compgen filedir "$sumtype"
2828
return
2929
fi
3030
done
3131

32-
_comp_compgen -a filedir
32+
_comp_compgen filedir
3333
((${#COMPREPLY[@]})) &&
3434
COMPREPLY=($(compgen -X "*.$sumtype" -W '"${COMPREPLY[@]}"' -- "$cur"))
3535
} &&

‎completions/shellcheck

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ _comp_cmd_shellcheck()
4141
return
4242
;;
4343
--source-path | -${noargopts}P)
44-
_comp_compgen -a filedir -d
44+
_comp_compgen filedir -d
4545
COMPREPLY+=($(compgen -W 'SCRIPTDIR' -- "$cur"))
4646
return
4747
;;
@@ -58,7 +58,7 @@ _comp_cmd_shellcheck()
5858
return
5959
fi
6060

61-
_comp_compgen -a filedir
61+
_comp_compgen filedir
6262
} &&
6363
complete -F _comp_cmd_shellcheck shellcheck
6464

‎completions/sitecopy

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ _comp_cmd_sitecopy()
1818
return
1919
;;
2020
--logfile | --rcfile | -${noargopts}[gr])
21-
_comp_compgen -a filedir
21+
_comp_compgen filedir
2222
return
2323
;;
2424
--storepath | -${noargopts}p)
25-
_comp_compgen -a filedir -d
25+
_comp_compgen filedir -d
2626
return
2727
;;
2828
esac

‎completions/slapt-get

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ _comp_cmd_slapt_get()
77

88
case "$prev" in
99
--config | -c)
10-
_comp_compgen -a filedir
10+
_comp_compgen filedir
1111
return
1212
;;
1313
--retry | --search)

‎completions/slapt-src

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ _comp_cmd_slapt_src()
77

88
case "$prev" in
99
--config | -c)
10-
_comp_compgen -a filedir
10+
_comp_compgen filedir
1111
return
1212
;;
1313
--search | -s | --postprocess | -p)

‎completions/smartctl

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ _comp_cmd_smartctl__drivedb()
4040
prefix=+
4141
cur="${cur#+}"
4242
fi
43-
_comp_compgen -a filedir h
43+
_comp_compgen filedir h
4444
[[ $prefix ]] && COMPREPLY=("${COMPREPLY[@]/#/$prefix}")
4545
}
4646

@@ -125,7 +125,7 @@ _comp_cmd_smartctl()
125125
[[ ${COMPREPLY-} == *= ]] && compopt -o nospace
126126
else
127127
: "${cur:=/dev/}"
128-
_comp_compgen -a filedir
128+
_comp_compgen filedir
129129
fi
130130
} &&
131131
complete -F _comp_cmd_smartctl smartctl

‎completions/smbclient

+12-12
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ _comp_cmd_smbclient()
5757
return
5858
;;
5959
--configfile | --authentication-file | -${noargopts}[sA])
60-
_comp_compgen -a filedir
60+
_comp_compgen filedir
6161
return
6262
;;
6363
--log-basename | --directory | -${noargopts}[lD])
64-
_comp_compgen -a filedir -d
64+
_comp_compgen filedir -d
6565
return
6666
;;
6767
--socket-options | -${noargopts}O)
@@ -116,7 +116,7 @@ _comp_cmd_smbget()
116116
# shellcheck disable=SC2254
117117
case $prev in
118118
--outputfile | --rcfile | -${noargopts}[of])
119-
_comp_compgen -a filedir
119+
_comp_compgen filedir
120120
return
121121
;;
122122
--debuglevel | -${noargopts}d)
@@ -150,11 +150,11 @@ _comp_cmd_smbcacls()
150150
# shellcheck disable=SC2254
151151
case $prev in
152152
--configfile | --authentication-file | -${noargopts}[As])
153-
_comp_compgen -a filedir
153+
_comp_compgen filedir
154154
return
155155
;;
156156
--log-basename | -${noargopts}l)
157-
_comp_compgen -a filedir -d
157+
_comp_compgen filedir -d
158158
return
159159
;;
160160
--debuglevel | -${noargopts}d)
@@ -197,11 +197,11 @@ _comp_cmd_smbcquotas()
197197
# shellcheck disable=SC2254
198198
case $prev in
199199
--configfile | --authentication-file | -${noargopts}[sA])
200-
_comp_compgen -a filedir
200+
_comp_compgen filedir
201201
return
202202
;;
203203
--log-basename | -${noargopts}l)
204-
_comp_compgen -a filedir -d
204+
_comp_compgen filedir -d
205205
return
206206
;;
207207
--debuglevel | -${noargopts}d)
@@ -241,7 +241,7 @@ _comp_cmd_smbpasswd()
241241
return
242242
;;
243243
-*c)
244-
_comp_compgen -a filedir
244+
_comp_compgen filedir
245245
return
246246
;;
247247
-*D)
@@ -266,7 +266,7 @@ _comp_cmd_smbtar()
266266

267267
case $prev in
268268
-*[rt])
269-
_comp_compgen -a filedir tar
269+
_comp_compgen filedir tar
270270
return
271271
;;
272272
-*s)
@@ -278,7 +278,7 @@ _comp_cmd_smbtar()
278278
return
279279
;;
280280
-*N)
281-
_comp_compgen -a filedir
281+
_comp_compgen filedir
282282
return
283283
;;
284284
-*[pxbdu])
@@ -301,11 +301,11 @@ _comp_cmd_smbtree()
301301
# shellcheck disable=SC2254
302302
case $prev in
303303
--configfile | --authentication-file | -${noargopts}[sA])
304-
_comp_compgen -a filedir
304+
_comp_compgen filedir
305305
return
306306
;;
307307
--log-basename | -${noargopts}l)
308-
_comp_compgen -a filedir -d
308+
_comp_compgen filedir -d
309309
return
310310
;;
311311
--debuglevel | -${noargopts}d)

‎completions/sqlite3

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ _comp_cmd_sqlite3()
1313
return
1414
;;
1515
-init)
16-
_comp_compgen -a filedir
16+
_comp_compgen filedir
1717
return
1818
;;
1919
-cmd)
@@ -31,7 +31,7 @@ _comp_cmd_sqlite3()
3131
return
3232
fi
3333

34-
_comp_compgen -a filedir "$dbexts"
34+
_comp_compgen filedir "$dbexts"
3535
} &&
3636
complete -F _comp_cmd_sqlite3 sqlite3
3737

‎completions/ss

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ _comp_cmd_ss()
2222
return
2323
;;
2424
--diag | --filter | -${noargopts}[DF])
25-
_comp_compgen -a filedir
25+
_comp_compgen filedir
2626
return
2727
;;
2828
esac

‎completions/ssh

+12-12
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ _comp_cmd_ssh__suboption()
129129
;;
130130
*file | identityagent | include | controlpath | revokedhostkeys | \
131131
xauthlocation)
132-
_comp_compgen -a filedir
132+
_comp_compgen filedir
133133
;;
134134
casignaturealgorithms)
135135
COMPREPLY=($(compgen -W '$(_comp_xfunc_ssh_query "$2" sig)' -- "$cur"))
@@ -169,7 +169,7 @@ _comp_cmd_ssh__suboption()
169169
_comp_cmd_ssh__macs "$2"
170170
;;
171171
pkcs11provider)
172-
_comp_compgen -a filedir so
172+
_comp_compgen filedir so
173173
;;
174174
preferredauthentications)
175175
COMPREPLY=($(compgen -W 'gssapi-with-mic host-based publickey
@@ -293,11 +293,11 @@ _comp_cmd_ssh()
293293
return
294294
;;
295295
-*[EFS])
296-
_comp_compgen -a filedir
296+
_comp_compgen filedir
297297
return
298298
;;
299299
-*I)
300-
_comp_compgen -a filedir so
300+
_comp_compgen filedir so
301301
return
302302
;;
303303
-*i)
@@ -342,7 +342,7 @@ _comp_cmd_ssh()
342342

343343
if [[ $cur == -F* ]]; then
344344
cur=${cur#-F}
345-
_comp_compgen -a filedir
345+
_comp_compgen filedir
346346
# Prefix completions with '-F'
347347
COMPREPLY=("${COMPREPLY[@]/#/-F}")
348348
cur=-F$cur # Restore cur
@@ -383,7 +383,7 @@ _comp_cmd_sftp()
383383
return
384384
;;
385385
-*[bF])
386-
_comp_compgen -a filedir
386+
_comp_compgen filedir
387387
return
388388
;;
389389
-*i)
@@ -417,7 +417,7 @@ _comp_cmd_sftp()
417417

418418
if [[ $cur == -F* ]]; then
419419
cur=${cur#-F}
420-
_comp_compgen -a filedir
420+
_comp_compgen filedir
421421
# Prefix completions with '-F'
422422
COMPREPLY=("${COMPREPLY[@]/#/-F}")
423423
cur=-F$cur # Restore cur
@@ -474,10 +474,10 @@ _comp_xfunc_ssh_scp_remote_files()
474474

475475
_comp_deprecate_func _scp_remote_files _comp_xfunc_ssh_scp_remote_files
476476

477-
# This approach is used instead of _comp_compgen -a filedir to get a space appended
478-
# after local file/dir completions, and -o nospace retained for others.
479-
# If first arg is -d, complete on directory names only. The next arg is
480-
# an optional prefix to add to returned completions.
477+
# This approach is used instead of _comp_compgen_filedir to get a space
478+
# appended after local file/dir completions, and -o nospace retained for
479+
# others. If first arg is -d, complete on directory names only. The next arg
480+
# is an optional prefix to add to returned completions.
481481
_comp_xfunc_ssh_scp_local_files()
482482
{
483483
local IFS=$'\n'
@@ -528,7 +528,7 @@ _comp_cmd_scp()
528528
return
529529
;;
530530
-*F)
531-
_comp_compgen -a filedir
531+
_comp_compgen filedir
532532
compopt +o nospace
533533
return
534534
;;

‎completions/ssh-add

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ _comp_cmd_ssh_add()
1414
return
1515
;;
1616
-*T)
17-
_comp_compgen -a filedir
17+
_comp_compgen filedir
1818
return
1919
;;
2020
-*[se])
21-
_comp_compgen -a filedir so
21+
_comp_compgen filedir so
2222
return
2323
;;
2424
esac
@@ -28,7 +28,7 @@ _comp_cmd_ssh_add()
2828
return
2929
fi
3030

31-
_comp_compgen -a filedir
31+
_comp_compgen filedir
3232
} &&
3333
complete -F _comp_cmd_ssh_add ssh-add
3434

0 commit comments

Comments
 (0)