Merge pull request #1052 from akinomyoga/misc-1

fix: add misc fixes (misc-1)

Author: scop

bash_completion

@@ -372,7 +372,7 @@ _comp_split()
     shift "$((OPTIND - 1))"
     if (($# != 2)); then
         printf '%s\n' "bash_completion: $FUNCNAME: unexpected number of arguments" >&2
-        printf '%s\n' "usage: $FUNCNAME [-a] [-F SEP] ARRAY_NAME TEXT" >&2
+        printf '%s\n' "usage: $FUNCNAME [-al] [-F SEP] ARRAY_NAME TEXT" >&2
         return 2
     elif [[ $1 == @(*[^_a-zA-Z0-9]*|[0-9]*|''|_*|IFS|OPTIND|OPTARG|OPTERR) ]]; then
         printf '%s\n' "bash_completion: $FUNCNAME: invalid array name '$1'" >&2
@@ -420,8 +420,8 @@ _comp_compgen__error_fallback()
 #   -a      Append to the array
 #   -v arr  Store the results to the array ARR. The default is `COMPREPLY`.
 #           The array name should not start with an underscores "_", which is
-#           internally used.  The array name should not be either "IFS" or
-#           "OPT{IND,ARG,ERR}".
+#           internally used.  The array name should not be any of "cur", "IFS"
+#           or "OPT{IND,ARG,ERR}".
 #   -U var  Unlocalize VAR before performing the assignments.  This option can
 #           be specified multiple times to register multiple variables.  This
 #           option is supposed to be used in implementing a generator (G1) when
@@ -538,7 +538,7 @@ _comp_compgen()
         case $_opt in
             a) _append=set ;;
             v)
-                if [[ $OPTARG == @(*[^_a-zA-Z0-9]*|[0-9]*|''|_*|IFS|OPTIND|OPTARG|OPTERR) ]]; then
+                if [[ $OPTARG == @(*[^_a-zA-Z0-9]*|[0-9]*|''|_*|IFS|OPTIND|OPTARG|OPTERR|cur) ]]; then
                     printf 'bash_completion: %s: -v: invalid array name `%s'\''\n' "$FUNCNAME" "$OPTARG" >&2
                     return 2
                 fi
@@ -548,7 +548,7 @@ _comp_compgen()
                 if [[ $OPTARG == @(*[^_a-zA-Z0-9]*|[0-9]*|'') ]]; then
                     printf 'bash_completion: %s: -U: invalid variable name `%s'\''\n' "$FUNCNAME" "$OPTARG" >&2
                     return 2
-                elif [[ $OPTARG == @(_*|IFS|OPTIND|OPTARG|OPTERR) ]]; then
+                elif [[ $OPTARG == @(_*|IFS|OPTIND|OPTARG|OPTERR|cur) ]]; then
                     printf 'bash_completion: %s: -U: unnecessary to mark `%s'\'' as upvar\n' "$FUNCNAME" "$OPTARG" >&2
                     return 2
                 fi
@@ -954,9 +954,11 @@ _comp_get_words()
         upvars+=("$vcword")
         upargs+=(-v "$vcword" "$cword")
     }
-    [[ $vprev && $cword -ge 1 ]] && {
+    [[ $vprev ]] && {
+        local value=""
+        ((cword >= 1)) && value=${words[cword - 1]}
         upvars+=("$vprev")
-        upargs+=(-v "$vprev" "${words[cword - 1]}")
+        upargs+=(-v "$vprev" "$value")
     }
     [[ $vwords ]] && {
         # Note: bash < 4.4 has a bug that all the elements are connected with
@@ -1333,7 +1335,7 @@ _comp_variable_assignments()
 # @since 2.12
 _comp_initialize()
 {
-    local exclude="" opt_split="" outx errx inx
+    local exclude="" opt_split="" outx="" errx="" inx=""
 
     local flag OPTIND=1 OPTARG="" OPTERR=0
     while getopts "n:e:o:i:s" flag "$@"; do
@@ -1983,10 +1985,11 @@ _service()
 
 _comp__init_set_up_service_completions()
 {
-    local sysvdirs svc svcdir
+    local sysvdirs svc svcdir svcs
     _comp_sysvdirs &&
         for svcdir in "${sysvdirs[@]}"; do
-            for svc in "$svcdir"/!($_comp_backup_glob); do
+            _comp_expand_glob svcs '"$svcdir"/!($_comp_backup_glob)'
+            for svc in "${svcs[@]}"; do
                 [[ -x $svc ]] && complete -F _service "$svc"
             done
         done

bash_completion.d/000_bash_completion_compat.bash

@@ -1,4 +1,4 @@
-# Deprecated bash_completion functions and variables        -*- shell-script -*-
+# Deprecated bash_completion functions and variables       -*- shell-script -*-
 
 _comp_deprecate_func 2.12 _userland _comp_userland
 _comp_deprecate_func 2.12 _sysvdirs _comp_sysvdirs

completions/acpi

@@ -1,4 +1,4 @@
-# acpi(1) completion                                        -*- shell-script -*-
+# acpi(1) completion                                       -*- shell-script -*-
 
 _comp_cmd_acpi()
 {

completions/apt-mark

@@ -1,4 +1,4 @@
-# Debian apt-mark(8) completion                             -*- shell-script -*-
+# Debian apt-mark(8) completion                            -*- shell-script -*-
 
 _comp_cmd_apt_mark()
 {

completions/arp

@@ -1,4 +1,4 @@
-# arp(8) completion                                 -*- shell-script -*-
+# arp(8) completion                                        -*- shell-script -*-
 
 _comp_cmd_arp()
 {

completions/bts

@@ -1,4 +1,4 @@
-# bts completion                                      -*- shell-script -*-
+# bts completion                                           -*- shell-script -*-
 
 # Generate bug numbers from bugs cache in ~/.devscripts_cache/bts
 _comp_cmd_bts__compgen_cached_bugs()

completions/dmypy

@@ -15,7 +15,7 @@ _comp_cmd_dmypy()
             ;;
     esac
 
-    local cmd has_cmd="" i
+    local cmd="" has_cmd="" i
     for ((i = 1; i < cword; i++)); do
         if [[ ${words[i]} != -* && ${words[i - 1]} != --status-file ]]; then
             cmd=${words[i]}

completions/make

@@ -88,7 +88,7 @@ EOF
 EOF
 }
 
-# Truncate the non-unique filepaths in COMPRELY to only generate unique
+# Truncate the non-unique filepaths in COMPREPLY to only generate unique
 # directories or files.  This function discards the files under subdirectories
 # unless the path is unique under each subdirectory and instead generate the
 # subdirectory path.  For example, when there are two candidates, "abc/def" and

completions/pkgrm

@@ -1,4 +1,4 @@
-# pkgrm completion                                        -*- shell-script -*-
+# pkgrm completion                                         -*- shell-script -*-
 #
 # Copyright 2006 Yann Rouillard <[email protected]>
 

completions/pkgutil

@@ -1,4 +1,4 @@
-# pkgutil completion                                        -*- shell-script -*-
+# pkgutil completion                                       -*- shell-script -*-
 # Copyright 2006 Yann Rouillard <[email protected]>
 
 _comp_cmd_pkgutil__url2catalog()

completions/uscan

@@ -1,4 +1,4 @@
-# uscan completion                                      -*- shell-script -*-
+# uscan completion                                         -*- shell-script -*-
 
 _comp_cmd_uscan()
 {

test/config/bashrc

@@ -67,8 +67,10 @@ _comp__test_get_env()
     (
         # Do not output the state of test variables "_comp__test_+([0-9])_*"
         # and internal mutable variables "_comp_*_mut_*".
+        local IFS=$' \t\n'
         # shellcheck disable=SC2046
         unset -v $(compgen -W '"${!_comp_@}"' -X '!_comp_@(_test_+([0-9])_*|*_mut_*)')
+        _comp_unlocal IFS
 
         set -o posix
         set

test/t/unit/test_unit_initialize.py

@@ -6,7 +6,7 @@
 @pytest.mark.bashcomp(
     cmd=None,
     ignore_env=r"^[+-](COMP(_(WORDS|CWORD|LINE|POINT)|REPLY)|"
-    r"cur|cword|words)=|^\+declare -f _cmd1$",
+    r"cur|prev|cword|words)=|^\+declare -f _cmd1$",
 )
 class TestUnitInitCompletion(TestUnitBase):
     def test_1(self, bash):