Skip to content

Commit f996832

Browse files
committed
refactor(_*): apply current naming guidelines
Renames all functions whose API is the kind we like it to have; ones that have some work ahead on that front are not addressed here yet, for greppability. All utility functions in these files are considered private due to deprecation and possibly installed overriding completion.
1 parent 9533bb0 commit f996832

31 files changed

+107
-107
lines changed

completions/_adb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
# Use of this file is deprecated. Upstream completion is available in
44
# the Android SDK, use that instead.
55

6-
_adb_command_usage()
6+
_comp_cmd_adb__command_usage()
77
{
88
COMPREPLY=($(compgen -W \
99
'$("$1" help 2>&1 | command grep "^ *\(adb \)\? *$2 " \
1010
| command sed -e "s/[]|[]/\n/g" | _parse_help -)' -- "$cur"))
1111
}
1212

13-
_adb()
13+
_comp_cmd_adb()
1414
{
1515
local cur prev words cword comp_args
1616
_comp_initialize -- "$@" || return
@@ -49,7 +49,7 @@ _adb()
4949

5050
# TODO: more and better command completions
5151

52-
_adb_command_usage "$1" "$cmd"
52+
_comp_cmd_adb__command_usage "$1" "$cmd"
5353

5454
case $cmd in
5555
push | restore | sideload)
@@ -65,6 +65,6 @@ _adb()
6565
;;
6666
esac
6767
} &&
68-
complete -F _adb adb
68+
complete -F _comp_cmd_adb adb
6969

7070
# ex: filetype=sh

completions/_cal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux. Upstream completion is
44
# available in util-linux >= 2.23, use that instead.
55

6-
_cal()
6+
_comp_cmd_cal()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -34,6 +34,6 @@ _cal()
3434
_count_args
3535
((args == 1)) && COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
3636
} &&
37-
complete -F _cal cal ncal
37+
complete -F _comp_cmd_cal cal ncal
3838

3939
# ex: filetype=sh

completions/_chsh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux systems whose chsh is from
44
# util-linux. Upstream completion is in util-linux >= 2.23, use that instead.
55

6-
_chsh()
6+
_comp_cmd_chsh()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -40,6 +40,6 @@ _chsh()
4040
fi
4141

4242
} &&
43-
complete -F _chsh chsh
43+
complete -F _comp_cmd_chsh chsh
4444

4545
# ex: filetype=sh

completions/_dmesg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux. Upstream completion is
44
# available in util-linux >= 2.23, use that instead.
55

6-
_dmesg()
6+
_comp_cmd_dmesg()
77
{
88
[[ $OSTYPE == *solaris* ]] && return # no args there
99

@@ -29,6 +29,6 @@ _dmesg()
2929
compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
3030
))
3131
} &&
32-
complete -F _dmesg dmesg
32+
complete -F _comp_cmd_dmesg dmesg
3333

3434
# ex: filetype=sh

completions/_eject

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux. Upstream completion is
44
# available in util-linux >= 2.23, use that instead.
55

6-
_eject()
6+
_comp_cmd_eject()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -28,6 +28,6 @@ _eject()
2828
_cd_devices
2929
_dvd_devices
3030
} &&
31-
complete -F _eject eject
31+
complete -F _comp_cmd_eject eject
3232

3333
# ex: filetype=sh

completions/_hexdump

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux. Upstream completion is
44
# available in util-linux >= 2.23, use that instead.
55

6-
_hexdump()
6+
_comp_cmd_hexdump()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -27,6 +27,6 @@ _hexdump()
2727

2828
_filedir
2929
} &&
30-
complete -F _hexdump hexdump hd
30+
complete -F _comp_cmd_hexdump hexdump hd
3131

3232
# ex: filetype=sh

completions/_hwclock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated. Upstream completion is available in
44
# util-linux >= 2.23, use that instead.
55

6-
_hwclock()
6+
_comp_cmd_hwclock()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -21,6 +21,6 @@ _hwclock()
2121
COMPREPLY=(
2222
$(PATH="$PATH:/sbin" compgen -W '$(_parse_help "$1")' -- "$cur"))
2323
} &&
24-
complete -F _hwclock hwclock
24+
complete -F _comp_cmd_hwclock hwclock
2525

2626
# ex: filetype=sh

completions/_ionice

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated. Upstream completion is available in
44
# util-linux >= 2.23, use that instead.
55

6-
_ionice()
6+
_comp_cmd_ionice()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -55,6 +55,6 @@ _ionice()
5555
return
5656
fi
5757
} &&
58-
complete -F _ionice ionice
58+
complete -F _comp_cmd_ionice ionice
5959

6060
# ex: filetype=sh

completions/_look

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated on Linux. Upstream completion is
44
# available in util-linux >= 2.23, use that instead.
55

6-
_look()
6+
_comp_cmd_look()
77
{
88
local cur prev words cword comp_args
99
_comp_initialize -- "$@" || return
@@ -12,6 +12,6 @@ _look()
1212
COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur"))
1313
fi
1414
} &&
15-
complete -F _look -o default look
15+
complete -F _comp_cmd_look -o default look
1616

1717
# ex: filetype=sh

completions/_mock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Use of this file is deprecated. Upstream completion is available in
44
# mock > 1.1.0, use that instead.
55

6-
_mock()
6+
_comp_cmd_mock()
77
{
88
local cur prev words cword split comp_args
99
_comp_initialize -s -- "$@" || return
@@ -64,6 +64,6 @@ _mock()
6464
_filedir '@(?(no)src.r|s)pm'
6565
fi
6666
} &&
67-
complete -F _mock mock
67+
complete -F _comp_cmd_mock mock
6868

6969
# ex: filetype=sh

0 commit comments

Comments
 (0)