Merge pull request #1034 from akinomyoga/refactor-api-3

refactor: rename variable `{ => _comp_}root_command` plus misc small fixes

Author: scop

bash_completion

@@ -1751,10 +1751,11 @@ _expand()
             ;;
         ~*)
             _comp_compgen -v COMPREPLY tilde &&
-                eval "COMPREPLY[0]=$(printf ~%q "${COMPREPLY[0]#\~}")"
-            return ${#COMPREPLY[@]}
+                eval "COMPREPLY[0]=$(printf ~%q "${COMPREPLY[0]#\~}")" &&
+                return 1
             ;;
     esac
+    return 0
 }
 
 # Process ID related functions.
@@ -2722,7 +2723,7 @@ complete -F _comp_command aoss command "do" else eval exec ltrace nice nohup pad
 _comp_root_command()
 {
     local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-    local root_command=$1
+    local _comp_root_command=$1
     _comp_command
 }
 complete -F _comp_root_command fakeroot gksu gksudo kdesudo really
@@ -2732,7 +2733,7 @@ complete -F _comp_root_command fakeroot gksu gksudo kdesudo really
 # @since 2.12
 _comp_as_root()
 {
-    [[ $EUID -eq 0 || ${root_command-} ]]
+    [[ $EUID -eq 0 || ${_comp_root_command-} ]]
 }
 
 # Complete on available commands, subject to `no_empty_cmd_completion`.
@@ -2821,7 +2822,7 @@ _filedir_xspec()
     _comp_quote_compgen "$cur"
     local quoted=$ret
 
-    local xspec=${_xspecs[${1##*/}]} tmp
+    local xspec=${_xspecs[${1##*/}]}
     local -a toks
     _comp_compgen -v toks -c "$quoted" -- -d
 

completions/_slackpkg

@@ -51,7 +51,7 @@ _comp_cmd_slackpkg()
     . "$config"
 
     local i action
-    for ((i = 1; i < ${#words[@]}; i++)); do
+    for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* ]]; then
             action="${words[i]}"
             break

completions/getent

@@ -6,7 +6,7 @@ _comp_cmd_getent()
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[s]*)'
-    local i db has_db=""
+    local i db="" has_db=""
     for ((i = 1; i < cword; i++)); do
         # shellcheck disable=SC2254
         case ${words[i]} in
@@ -27,7 +27,7 @@ _comp_cmd_getent()
         esac
     done
 
-    case ${db-} in
+    case $db in
         passwd)
             _comp_compgen -- -u
             return
@@ -57,8 +57,9 @@ _comp_cmd_getent()
             ;;
     esac
 
+    # shellcheck disable=SC2254
     case $prev in
-        -s | --service)
+        -${noargopts}s | --service)
             return
             ;;
     esac

completions/sbopkg

@@ -36,7 +36,7 @@ _comp_cmd_sbopkg()
 
     local i config
     config="/etc/sbopkg/sbopkg.conf"
-    for ((i = ${#words[@]} - 1; i > 0; i--)); do
+    for ((i = ${#words[@]} - 2; i > 0; i--)); do
         if [[ ${words[i]} == -f ]]; then
             config="${words[i + 1]}"
             __expand_tilde_by_ref config
@@ -47,7 +47,7 @@ _comp_cmd_sbopkg()
     [[ -r $config ]] || return
     . "$config"
 
-    for ((i = 1; i < ${#words[@]}; i++)); do
+    for ((i = 1; i < ${#words[@]} - 1; i++)); do
         case "${words[i]}" in
             -V)
                 REPO_NAME="${words[i + 1]%%/*}"
@@ -58,11 +58,12 @@ _comp_cmd_sbopkg()
                 ;;
         esac
     done
-    [[ -r $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ]] || return
+    local file=${REPO_ROOT-}/${REPO_NAME-}/${REPO_BRANCH-}/SLACKBUILDS.TXT
+    [[ -r $file ]] || return
 
     COMPREPLY=($(
         command sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}" \
-            "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT"
+            "$file"
     ))
     _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
 } &&

completions/ssh

@@ -378,7 +378,7 @@ _comp_cmd_ssh()
         _count_args "=" "-*[BbcDeLpRWEFSIiJlmOoQw]"
         if ((args > 1)); then
             compopt -o filenames
-            _comp_compgen -a commands
+            _comp_compgen_commands
         else
             _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} \
                 -- "$cur"

completions/sudo

@@ -13,7 +13,7 @@ _comp_cmd_sudo()
         for ((i = 1; i <= cword; i++)); do
             if [[ ${words[i]} != -* ]]; then
                 local PATH=$PATH:/sbin:/usr/sbin:/usr/local/sbin
-                local root_command=${words[i]}
+                local _comp_root_command=$1
                 _comp_command_offset $i
                 return
             fi

completions/svcadm

@@ -108,6 +108,7 @@ _comp_cmd_svcadm()
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} == @(enable|disable|restart|refresh|clear|mark|milestone) ]]; then
             command=${words[i]}
+            break
         fi
     done
 

completions/timeout

@@ -2,17 +2,14 @@
 
 _comp_cmd_timeout()
 {
-    local cur prev words cword was_split comp_args i found=""
+    local cur prev words cword was_split comp_args i
     _comp_initialize -s -- "$@" || return
 
     local noargopts='!(-*|*[ks]*)'
-    for ((i = 1; i <= cword; i++)); do
+    for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* ]]; then
-            if [[ $found ]]; then
-                _comp_command_offset $i
-                return
-            fi
-            found=set
+            _comp_command_offset "$((i + 1))"
+            return
         fi
         # shellcheck disable=SC2254
         [[ ${words[i]} == -@(-kill-after|-signal|${noargopts}[ks]) ]] && ((i++))

completions/update-alternatives

@@ -31,7 +31,7 @@ _comp_cmd_update_alternatives()
             ;;
     esac
 
-    local mode args i
+    local mode="" args i
 
     # find which mode to use and how many real args used so far
     for ((i = 1; i < cword; i++)); do

test/t/test_chown.py

@@ -8,7 +8,7 @@
 @pytest.mark.bashcomp(
     pre_cmds=(
         # Fake root command to get all users/groups completed at least for now
-        "root_command=sudo",
+        "_comp_root_command=sudo",
     )
 )
 class TestChown: