Merge pull request #881 from scop/refactor/comp-cmd-deprecated

refactor(_*): apply current naming guidelines

Author: scop

completions/_adb

@@ -3,14 +3,14 @@
 # Use of this file is deprecated.  Upstream completion is available in
 # the Android SDK, use that instead.
 
-_adb_command_usage()
+_comp_cmd_adb__command_usage()
 {
     COMPREPLY=($(compgen -W \
         '$("$1" help 2>&1 | command grep "^ *\(adb \)\? *$2 " \
             | command sed -e "s/[]|[]/\n/g" | _parse_help -)' -- "$cur"))
 }
 
-_adb()
+_comp_cmd_adb()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -49,7 +49,7 @@ _adb()
 
     # TODO: more and better command completions
 
-    _adb_command_usage "$1" "$cmd"
+    _comp_cmd_adb__command_usage "$1" "$cmd"
 
     case $cmd in
         push | restore | sideload)
@@ -65,6 +65,6 @@ _adb()
             ;;
     esac
 } &&
-    complete -F _adb adb
+    complete -F _comp_cmd_adb adb
 
 # ex: filetype=sh

completions/_cal

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux.  Upstream completion is
 # available in util-linux >= 2.23, use that instead.
 
-_cal()
+_comp_cmd_cal()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -34,6 +34,6 @@ _cal()
     _count_args
     ((args == 1)) && COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
 } &&
-    complete -F _cal cal ncal
+    complete -F _comp_cmd_cal cal ncal
 
 # ex: filetype=sh

completions/_chsh

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux systems whose chsh is from
 # util-linux. Upstream completion is in util-linux >= 2.23, use that instead.
 
-_chsh()
+_comp_cmd_chsh()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -40,6 +40,6 @@ _chsh()
     fi
 
 } &&
-    complete -F _chsh chsh
+    complete -F _comp_cmd_chsh chsh
 
 # ex: filetype=sh

completions/_dmesg

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux.  Upstream completion is
 # available in util-linux >= 2.23, use that instead.
 
-_dmesg()
+_comp_cmd_dmesg()
 {
     [[ $OSTYPE == *solaris* ]] && return # no args there
 
@@ -29,6 +29,6 @@ _dmesg()
         compgen -W '$(_parse_help "$1" || _parse_usage "$1")' -- "$cur"
     ))
 } &&
-    complete -F _dmesg dmesg
+    complete -F _comp_cmd_dmesg dmesg
 
 # ex: filetype=sh

completions/_eject

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux.  Upstream completion is
 # available in util-linux >= 2.23, use that instead.
 
-_eject()
+_comp_cmd_eject()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -28,6 +28,6 @@ _eject()
     _cd_devices
     _dvd_devices
 } &&
-    complete -F _eject eject
+    complete -F _comp_cmd_eject eject
 
 # ex: filetype=sh

completions/_hexdump

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux.  Upstream completion is
 # available in util-linux >= 2.23, use that instead.
 
-_hexdump()
+_comp_cmd_hexdump()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -27,6 +27,6 @@ _hexdump()
 
     _filedir
 } &&
-    complete -F _hexdump hexdump hd
+    complete -F _comp_cmd_hexdump hexdump hd
 
 # ex: filetype=sh

completions/_hwclock

@@ -3,7 +3,7 @@
 # Use of this file is deprecated.  Upstream completion is available in
 # util-linux >= 2.23, use that instead.
 
-_hwclock()
+_comp_cmd_hwclock()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -21,6 +21,6 @@ _hwclock()
     COMPREPLY=(
         $(PATH="$PATH:/sbin" compgen -W '$(_parse_help "$1")' -- "$cur"))
 } &&
-    complete -F _hwclock hwclock
+    complete -F _comp_cmd_hwclock hwclock
 
 # ex: filetype=sh

completions/_ionice

@@ -3,7 +3,7 @@
 # Use of this file is deprecated.  Upstream completion is available in
 # util-linux >= 2.23, use that instead.
 
-_ionice()
+_comp_cmd_ionice()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -55,6 +55,6 @@ _ionice()
         return
     fi
 } &&
-    complete -F _ionice ionice
+    complete -F _comp_cmd_ionice ionice
 
 # ex: filetype=sh

completions/_look

@@ -3,7 +3,7 @@
 # Use of this file is deprecated on Linux.  Upstream completion is
 # available in util-linux >= 2.23, use that instead.
 
-_look()
+_comp_cmd_look()
 {
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
@@ -12,6 +12,6 @@ _look()
         COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur"))
     fi
 } &&
-    complete -F _look -o default look
+    complete -F _comp_cmd_look -o default look
 
 # ex: filetype=sh

completions/_mock

@@ -3,7 +3,7 @@
 # Use of this file is deprecated.  Upstream completion is available in
 # mock > 1.1.0, use that instead.
 
-_mock()
+_comp_cmd_mock()
 {
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
@@ -64,6 +64,6 @@ _mock()
         _filedir '@(?(no)src.r|s)pm'
     fi
 } &&
-    complete -F _mock mock
+    complete -F _comp_cmd_mock mock
 
 # ex: filetype=sh