Merge pull request #965 from scop/refactor/util-func-cmds

refactor: adjust to util/xfunc primary command convention

Author: scop

completions/aspell

@@ -2,7 +2,7 @@
 
 _comp_cmd_aspell__dictionary()
 {
-    local datadir aspell=${1:-aspell}
+    local datadir aspell=$1
     datadir=$("$aspell" config data-dir 2>/dev/null || echo /usr/lib/aspell)
     # First, get aliases (dicts dump does not list them)
     COMPREPLY=($datadir/*.alias)

completions/carton

@@ -2,14 +2,14 @@
 
 _comp_cmd_carton__commands()
 {
-    local cmds=$("${1:-carton}" usage 2>&1 |
+    local cmds=$("$1" usage 2>&1 |
         command sed -ne '/.*command.* is one of/{n;p;q;}')
     _comp_compgen -aF $' \t\n,' -- -W "$cmds"
 }
 
 _comp_cmd_carton__command_help()
 {
-    local help=$(PERLDOC_PAGER=cat PERLDOC=-otext "${1:-carton}" -h "$2" 2>&1)
+    local help=$(PERLDOC_PAGER=cat PERLDOC=-otext "$1" -h "$2" 2>&1)
     _comp_compgen -a -- -W '$help'
 }
 

completions/iconv

@@ -3,11 +3,20 @@
 # @since 2.12
 _comp_xfunc_iconv_charsets()
 {
-    COMPREPLY+=($(compgen -X ... -W '$("${1:-iconv}" -l | \
-        command sed -e "s@/*\$@@" -e "s/[,()]//g")' -- "$cur"))
+    _comp_cmd_iconv__charsets iconv
+}
+
+# @deprecated 2.12 use `_comp_xfunc_iconv_charsets` instead
+_iconv_charsets()
+{
+    _comp_cmd_iconv__charsets "${1:-iconv}"
 }
 
-_comp_deprecate_func 2.12 _iconv_charsets _comp_xfunc_iconv_charsets
+_comp_cmd_iconv__charsets()
+{
+    COMPREPLY+=($(compgen -X ... -W '$("$1" -l | \
+        command sed -e "s@/*\$@@" -e "s/[,()]//g")' -- "$cur"))
+}
 
 _comp_cmd_iconv()
 {
@@ -22,7 +31,7 @@ _comp_cmd_iconv()
             return
             ;;
         --from-code | --to-code | -${noargopts}[ft])
-            _comp_xfunc_iconv_charsets "$1"
+            _comp_cmd_iconv__charsets "$1"
             return
             ;;
         --output | -${noargopts}o)

completions/mysql

@@ -18,6 +18,10 @@ _comp_cmd_mysql()
     local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
+    # Prefer `mysqlshow` in the same dir as the command
+    local pathcmd
+    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+
     local noargopts='!(-*|*[uDhSPeI]*)'
     # shellcheck disable=SC2254
     case $prev in

completions/perl

@@ -3,7 +3,7 @@
 _comp_cmd_perl__helper()
 {
     COMPREPLY=($(compgen -P "$prefix" -W \
-        "$("${2:-perl}" "${BASH_SOURCE[0]%/*}/../helpers/perl" "$1" "$cur")" \
+        "$("${1:-perl}" "${BASH_SOURCE[0]%/*}/../helpers/perl" "$2" "$cur")" \
         -- "$cur"))
     [[ $1 == functions ]] || _comp_ltrim_colon_completions "$prefix$cur"
 }
@@ -41,7 +41,7 @@ _comp_cmd_perl()
                 temp="${cur#-}"
                 prefix+=${cur%"$temp"}
                 cur="$temp"
-                _comp_cmd_perl__helper modules "$1"
+                _comp_cmd_perl__helper "$1" modules
                 return
                 ;;
             -*V)
@@ -61,7 +61,7 @@ _comp_cmd_perl()
                     temp="${cur#:}"
                     prefix=$prefix${cur%"$temp"}
                     cur="Devel::$temp"
-                    _comp_cmd_perl__helper modules "$1"
+                    _comp_cmd_perl__helper "$1" modules
                 fi
                 ;;
         esac
@@ -106,8 +106,9 @@ _comp_cmd_perldoc()
         prefix=$prev
     fi
 
-    local perl="${1%doc}"
-    [[ $perl == "$1" ]] || ! type "$perl" &>/dev/null && perl=
+    # Prefer `perl` in the same dir in utility functions
+    local pathcmd
+    pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
 
     case $prev in
         -*[hVnoMwL])
@@ -118,7 +119,7 @@ _comp_cmd_perldoc()
             return
             ;;
         -*f)
-            _comp_cmd_perl__helper functions "$perl"
+            _comp_cmd_perl__helper "" functions
             return
             ;;
     esac
@@ -128,7 +129,7 @@ _comp_cmd_perldoc()
     else
         # return available modules (unless it is clearly a file)
         if [[ $cur != @(*/|[.~])* ]]; then
-            _comp_cmd_perl__helper perldocs "$perl"
+            _comp_cmd_perl__helper "" perldocs
             if [[ $cur == p* ]]; then
                 COMPREPLY+=($(compgen -W \
                     '$(PERLDOC_PAGER=cat "$1" -u perl |  \

completions/pydoc

@@ -23,9 +23,10 @@ _comp_cmd_pydoc()
     _comp_compgen -- -W 'keywords topics modules'
 
     if ! _comp_looks_like_path "$cur"; then
-        local python=python
-        [[ ${1##*/} == *3* ]] && python=python3
-        _comp_xfunc python modules $python
+        # Prefer python in the same dir for resolving modules
+        local pathcmd
+        pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+        _comp_xfunc python modules
     fi
 
     # Note that we don't do "pydoc modules" as it is known to hang on

completions/pylint

@@ -10,10 +10,10 @@ _comp_cmd_pylint__message_ids()
     #   again later?
     local msgs="$(
         set -o pipefail
-        ${1:-pylint} --list-msgs-enabled 2>/dev/null |
+        "$1" --list-msgs-enabled 2>/dev/null |
             command sed -ne "$filter" |
             command sed -ne 's/^[[:space:]]\{1,\}\([a-z-]\{6,\}\).*/\1/p' ||
-            ${1:-pylint} --list-msgs 2>/dev/null |
+            "$1" --list-msgs 2>/dev/null |
             command sed -ne 's/^:\([a-z-]\{6,\}\).*/\1/p'
     )"
     _comp_delimited , -W "$msgs"

completions/pytest

@@ -2,7 +2,7 @@
 
 _comp_cmd_pytest__option_choice_args()
 {
-    local modes=$("${2:-pytest}" "$1=bash-completion-nonexistent" 2>&1 |
+    local modes=$("$1" "$2=bash-completion-nonexistent" 2>&1 |
         command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
             -ne 's/.*choose from //p')
     _comp_compgen -a -- -W '$modes'
@@ -87,7 +87,7 @@ _comp_cmd_pytest()
             return
             ;;
         --dist | --vcr-record?(-mode))
-            _comp_cmd_pytest__option_choice_args "$prev" "$1"
+            _comp_cmd_pytest__option_choice_args "$1" "$prev"
             return
             ;;
     esac

completions/python

@@ -2,9 +2,22 @@
 
 # @since 2.12
 _comp_xfunc_python_modules()
+{
+    local python=python
+    [[ ${comp_args[0]##*/} == *3* ]] && python=python3
+    _comp_cmd_python__modules "$python"
+}
+
+# @deprecated 2.12 use `_comp_xfunc_python_modules` instead
+_python_modules()
+{
+    _comp_cmd_python__modules "${1:-python}"
+}
+
+_comp_cmd_python__modules()
 {
     COMPREPLY+=($(compgen -W \
-        "$("${1:-python}" "${BASH_SOURCE[0]%/*}/../helpers/python" "$cur" \
+        "$("$1" "${BASH_SOURCE[0]%/*}/../helpers/python" "$cur" \
             2>/dev/null)" -- "$cur"))
 }
 
@@ -15,7 +28,6 @@ _comp_xfunc_python_warning_actions()
         ${prefix:+-P "$prefix"}
 }
 
-_comp_deprecate_func 2.12 _python_modules _comp_xfunc_python_modules
 _comp_deprecate_func 2.12 _python_warning_actions \
     _comp_xfunc_python_warning_actions
 
@@ -39,7 +51,7 @@ _comp_cmd_python()
             return
             ;;
         -${noargopts}m)
-            _comp_xfunc_python_modules "$1"
+            _comp_cmd_python__modules "$1"
             return
             ;;
         -${noargopts}Q)

completions/rpm

@@ -4,6 +4,11 @@
 
 # @since 2.12
 _comp_xfunc_rpm_installed_packages()
+{
+    _comp_cmd_rpm__installed_packages rpm
+}
+
+_comp_cmd_rpm__installed_packages()
 {
     if [[ -r /var/log/rpmpkgs &&
         /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]]; then
@@ -38,13 +43,20 @@ _comp_cmd_rpm__macros()
         -- "$cur"))
 }
 
+# shellcheck disable=SC2120
 _comp_cmd_rpm__buildarchs()
 {
     COMPREPLY=($(compgen -W "$("${1:-rpm}" --showrc | command sed -ne \
         's/^\s*compatible\s\s*build\s\s*archs\s*:\s*\(.*\)/\1/ p')" \
         -- "$cur"))
 }
 
+# shellcheck disable=SC2120
+_comp_cmd_rpm__configdir()
+{
+    cfgdir=$("${1:-rpm}" --eval '%{_rpmconfigdir}' 2>/dev/null)
+}
+
 # rpm(8) completion
 #
 _comp_cmd_rpm()
@@ -147,7 +159,7 @@ _comp_cmd_rpm()
                 _comp_compgen -- -W '"${opts[@]}" --allmatches --noscripts
                     --notriggers --nodeps --test --repackage'
             else
-                _comp_xfunc_rpm_installed_packages "$1"
+                _comp_cmd_rpm__installed_packages "$1"
             fi
             ;;
         -q* | --query)
@@ -190,7 +202,7 @@ _comp_cmd_rpm()
                         --whatrecommends --whatrequires --whatsuggests
                         --whatsupplements'
                 elif [[ ${words[*]} != *\ -@(*([^ -])a|-all )* ]]; then
-                    _comp_xfunc_rpm_installed_packages "$1"
+                    _comp_cmd_rpm__installed_packages "$1"
                 fi
             fi
             ;;
@@ -216,14 +228,14 @@ _comp_cmd_rpm()
             elif [[ ${words[*]} == *\ -@(*([^ -])p|-package )* ]]; then
                 _comp_compgen_filedir '[rs]pm'
             else
-                _comp_xfunc_rpm_installed_packages "$1"
+                _comp_cmd_rpm__installed_packages "$1"
             fi
             ;;
         --resign | --addsign | --delsign)
             _comp_compgen_filedir '[rs]pm'
             ;;
         --setperms | --setgids)
-            _comp_xfunc_rpm_installed_packages "$1"
+            _comp_cmd_rpm__installed_packages "$1"
             ;;
         --import | --dbpath | --root)
             if [[ $cur == -* ]]; then
@@ -242,30 +254,33 @@ _comp_cmd_rpmbuild()
     local cur prev words cword was_split comp_args
     _comp_initialize -s -- "$@" || return
 
-    local rpm="${1%build*}"
-    [[ $rpm == "$1" ]] || ! type "$rpm" &>/dev/null && rpm=
-
     local noargopts='!(-*|*[rED]*)'
-    # shellcheck disable=SC2254
+    # shellcheck disable=SC2119,SC2254
     case $prev in
         --buildroot | --root | --dbpath | -${noargopts}r)
             _comp_compgen_filedir -d
             return
             ;;
+        --target | --eval | -${noargopts}E | --buildpolicy)
+            # Prefer `rpm` in the same dir in utility functions
+            local pathcmd
+            pathcmd=$(type -P "$1") && local PATH=${pathcmd%/*}:$PATH
+            ;;&
         --target)
-            _comp_cmd_rpm__buildarchs "$rpm"
+            _comp_cmd_rpm__buildarchs
             return
             ;;
         --eval | -${noargopts}E)
-            _comp_cmd_rpm__macros "$rpm"
+            _comp_cmd_rpm__macros
             return
             ;;
         --macros | --rcfile)
             _comp_compgen_filedir
             return
             ;;
         --buildpolicy)
-            local cfgdir=$("$rpm" --eval '%{_rpmconfigdir}' 2>/dev/null)
+            local cfgdir
+            _comp_cmd_rpm__configdir
             if [[ $cfgdir ]]; then
                 COMPREPLY=($(compgen -W "$(command ls "$cfgdir" 2>/dev/null |
                     command sed -ne 's/^brp-//p')" -- "$cur"))