fix: use _comp_compgen for COMPREPLY+=($(compgen ... -- "$cur"))

akinomyoga · akinomyoga · commit 87509ba8e767 · 2023-05-08T02:30:09.000+09:00
diff --git a/completions/_mount.linux b/completions/_mount.linux
@@ -86,7 +86,7 @@ _comp_cmd_mount()
                 {,no}user users' -- "$cur"))
             case "$fstype" in
                 adfs | auto)
-                    COMPREPLY+=($(compgen -W '{u,g}id= {own,oth}mask=' -- "$cur"))
+                    _comp_compgen -a -- -W '{u,g}id= {own,oth}mask='
                     ;;&
                 affs | auto)
                     COMPREPLY+=($(compgen -W '{u,g}id= set{u,g}id= mode= protect
@@ -145,7 +145,7 @@ _comp_cmd_mount()
                     iocharset= utf8' -- "$cur"))
                     ;;&
                 jffs2 | auto)
-                    COMPREPLY+=($(compgen -W 'compr= rp_size=' -- "$cur"))
+                    _comp_compgen -a -- -W 'compr= rp_size='
                     ;;&
                 jfs | auto)
                     COMPREPLY+=($(compgen -W 'iocharset= resize= {,no}integrity
@@ -175,7 +175,7 @@ _comp_cmd_mount()
                     {,no}compression debug no_detach' -- "$cur"))
                     ;;&
                 proc | auto)
-                    COMPREPLY+=($(compgen -W '{u,g}id=' -- "$cur"))
+                    _comp_compgen -a -- -W '{u,g}id='
                     ;;&
                 reiserfs | auto)
                     COMPREPLY+=($(compgen -W 'conv hash= {,no_un}hashed_relocation
diff --git a/completions/asciidoc b/completions/asciidoc
@@ -2,7 +2,7 @@
 
 _comp_xfunc_asciidoc_doctype()
 {
-    COMPREPLY+=($(compgen -W 'article book manpage' -- "$cur"))
+    _comp_compgen -a -- -W 'article book manpage'
 }
 
 _comp_deprecate_func _asciidoc_doctype _comp_xfunc_asciidoc_doctype
diff --git a/completions/carton b/completions/carton
@@ -10,7 +10,7 @@ _comp_cmd_carton__commands()
 _comp_cmd_carton__command_help()
 {
     local help=$(PERLDOC_PAGER=cat PERLDOC=-otext "${1:-carton}" -h "$2" 2>&1)
-    COMPREPLY+=($(compgen -W '$help' -- "$cur"))
+    _comp_compgen -a -- -W '$help'
 }
 
 _comp_cmd_carton()
@@ -58,7 +58,7 @@ _comp_cmd_carton()
         --without)
             if [[ $command == install ]]; then
                 local phases="configure build test runtime develop"
-                COMPREPLY+=($(compgen -W '$phases' -- "$cur"))
+                _comp_compgen -a -- -W '$phases'
                 return
             fi
             ;;
diff --git a/completions/chronyc b/completions/chronyc
@@ -9,7 +9,7 @@ _comp_cmd_chronyc__command_args()
         \<address\>) _known_hosts_real -- "$cur" ;;
         \<*) ;;
         *) ((${#args[@]})) &&
-            COMPREPLY+=($(compgen -W '"${args[@]}"' -- "$cur")) ;;
+            _comp_compgen -a -- -W '"${args[@]}"' ;;
     esac
 }
 
diff --git a/completions/dnssec-keygen b/completions/dnssec-keygen
@@ -6,7 +6,7 @@ _comp_cmd_dnssec_keygen__optarg()
         command sed -e 's/|/ /g' -e 's/(.*//' \
             -ne '/^[[:space:]]*'"$2"'/,/^[[:space:]]*[(-]/p' |
         command sed -e 's/^[[:space:]]*'"$2"'.*://' -e '/^[[:space:]]*-/d')
-    COMPREPLY+=($(compgen -W '$args' -- "$cur"))
+    _comp_compgen -a -- -W '$args'
 }
 
 _comp_cmd_dnssec_keygen()
diff --git a/completions/feh b/completions/feh
@@ -52,7 +52,7 @@ _comp_cmd_feh()
                 if [[ $theme_name == '#'* || $theme_name == "" ]]; then
                     continue
                 fi
-                COMPREPLY+=($(compgen -W "$theme_name" -- "$cur"))
+                _comp_compgen -a -- -W "$theme_name"
             done <"$conf_path"
             return
             ;;
@@ -83,7 +83,7 @@ _comp_cmd_feh()
             ;;
         --bg | -${noargopts}b)
             _comp_compgen_filedir
-            COMPREPLY+=($(compgen -W 'trans' -- "$cur"))
+            _comp_compgen -a -- -W 'trans'
             return
             ;;
         --geometry | --max-dimension | --min-dimension | -${noargopts}g)
diff --git a/completions/find b/completions/find
@@ -28,7 +28,7 @@ _comp_cmd_find()
         -fstype)
             _fstypes
             [[ $OSTYPE == *bsd* ]] &&
-                COMPREPLY+=($(compgen -W 'local rdonly' -- "$cur"))
+                _comp_compgen -a -- -W 'local rdonly'
             return
             ;;
         -gid)
diff --git a/completions/ip b/completions/ip
@@ -128,7 +128,7 @@ _comp_cmd_ip()
                 show)
                     if ((cword == subcword + 1)); then
                         _available_interfaces
-                        COMPREPLY+=($(compgen -W 'dev group up' -- "$cur"))
+                        _comp_compgen -a -- -W 'dev group up'
                     elif [[ $prev == dev ]]; then
                         _available_interfaces
                     elif [[ $prev == group ]]; then
diff --git a/completions/lintian b/completions/lintian
@@ -16,7 +16,7 @@ _comp_cmd_lintian__tags()
     elif [[ $cur == *,* ]]; then
         COMPREPLY+=($(compgen -P "${cur%,*}," -W "$tags" -- "${cur##*,}"))
     else
-        COMPREPLY+=($(compgen -W "$tags" -- "$cur"))
+        _comp_compgen -a -- -W "$tags"
     fi
 }
 
@@ -42,7 +42,7 @@ _comp_cmd_lintian__checks()
     elif [[ $cur == *,* ]]; then
         COMPREPLY+=($(compgen -P "${cur%,*}," -W "$checks" -- "${cur##*,}"))
     else
-        COMPREPLY+=($(compgen -W "$checks" -- "$cur"))
+        _comp_compgen -a -- -W "$checks"
     fi
 }
 
@@ -63,7 +63,7 @@ _comp_cmd_lintian__infos()
     elif [[ $cur == *,* ]]; then
         COMPREPLY+=($(compgen -P "${cur%,*}," -W "$infos" -- "${cur##*,}"))
     else
-        COMPREPLY+=($(compgen -W "$infos" -- "$cur"))
+        _comp_compgen -a -- -W "$infos"
     fi
 }
 
diff --git a/completions/lspci b/completions/lspci
@@ -23,7 +23,7 @@ _comp_cmd_lspci()
             return
             ;;
         -*H)
-            COMPREPLY+=($(compgen -W "1 2" -- "$cur"))
+            _comp_compgen -a -- -W "1 2"
             return
             ;;
         -*F)
diff --git a/completions/mussh b/completions/mussh
@@ -39,7 +39,7 @@ _comp_cmd_mussh()
             ;;
         -c)
             compopt -o filenames
-            COMPREPLY+=($(compgen -c -- "$cur"))
+            _comp_compgen -a -- -c
             return
             ;;
     esac
diff --git a/completions/mutt b/completions/mutt
@@ -106,7 +106,7 @@ _comp_cmd_mutt__aliases()
     aliases=($(command sed -n 's|^alias[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' \
         "${conffiles[@]}"))
     ((${#aliases[@]})) &&
-        COMPREPLY+=($(compgen -W '"${aliases[@]}"' -- "$cur"))
+        _comp_compgen -a -- -W '"${aliases[@]}"'
 }
 
 # @param $1 (cur) Current word to complete
@@ -125,7 +125,7 @@ _comp_cmd_mutt__query()
             command sed -n '2,$s|^\([^[:space:]]\{1,\}\).*|\1|p'))
     fi
 
-    COMPREPLY+=($(compgen -W "${queryresults[*]}" -- "$cur"))
+    _comp_compgen -a -- -W "${queryresults[*]}"
 }
 
 # @param $1 (cur) Current word to complete
diff --git a/completions/mysql b/completions/mysql
@@ -8,7 +8,7 @@ _comp_xfunc_mysql_character_sets()
     charsets=("${charsets[@]##*/}")
     charsets=("${charsets[@]%.xml}")
     local IFS=$'\n'
-    COMPREPLY+=($(compgen -W '"${charsets[@]}"' -X '' -- "$cur"))
+    _comp_compgen -a -- -W '"${charsets[@]}"' -X ''
 }
 
 _comp_deprecate_func _mysql_character_sets _comp_xfunc_mysql_character_sets
diff --git a/completions/ngrep b/completions/ngrep
@@ -15,7 +15,7 @@ _comp_cmd_ngrep()
             ;;
         -d)
             _available_interfaces -a
-            COMPREPLY+=($(compgen -W 'any' -- "$cur"))
+            _comp_compgen -a -- -W 'any'
             return
             ;;
         -W)
diff --git a/completions/nslookup b/completions/nslookup
@@ -2,7 +2,7 @@
 
 _comp_cmd_nslookup__queryclass()
 {
-    COMPREPLY+=($(compgen -W 'IN CH HS ANY' -- "$cur"))
+    _comp_compgen -a -- -W 'IN CH HS ANY'
 }
 
 _comp_cmd_nslookup__querytype()
@@ -20,7 +20,7 @@ _comp_cmd_nslookup__querytype()
     # Selected obsolete record types
     types+=(SPF)
 
-    COMPREPLY+=($(compgen -W '"${types[@]}"' -- "$cur"))
+    _comp_compgen -a -- -W '"${types[@]}"'
 }
 
 _comp_cmd_nslookup()
diff --git a/completions/puppet b/completions/puppet
@@ -29,15 +29,15 @@ _comp_cmd_puppet__certs()
     else
         cert_list=$("$puppetca" --list)
     fi
-    COMPREPLY+=($(compgen -W "$cert_list" -- "$cur"))
+    _comp_compgen -a -- -W "$cert_list"
 }
 
 _comp_cmd_puppet__types()
 {
     puppet_types=$(
         puppet describe --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/'
     )
-    COMPREPLY+=($(compgen -W "$puppet_types" -- "$cur"))
+    _comp_compgen -a -- -W "$puppet_types"
 }
 
 _comp_cmd_puppet__references()
@@ -49,7 +49,7 @@ _comp_cmd_puppet__references()
     puppet_doc_list=$(
         $puppetdoc --list | command sed -e 's/^\(\S\{1,\}\).*$/\1/'
     )
-    COMPREPLY+=($(compgen -W "$puppet_doc_list" -- "$cur"))
+    _comp_compgen -a -- -W "$puppet_doc_list"
 }
 
 _comp_cmd_puppet__subcmd_opts()
@@ -150,7 +150,7 @@ _comp_cmd_puppet()
                 *)
                     _comp_cmd_puppet__subcmd_opts "$1" "$subcommand"
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
+                    _comp_compgen -a -- -W '--no-daemonize'
                     return
                     ;;
             esac
@@ -192,7 +192,7 @@ _comp_cmd_puppet()
                     case $action in
                         fingerprint | list | verify | --fingerprint | --list | \
                             --verify)
-                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
+                            _comp_compgen -a -- -W '--all'
                             _comp_cmd_puppet__certs --all
                             return
                             ;;
@@ -205,7 +205,7 @@ _comp_cmd_puppet()
                             return
                             ;;
                         sign | --sign)
-                            COMPREPLY+=($(compgen -W '--all' -- "$cur"))
+                            _comp_compgen -a -- -W '--all'
                             _comp_cmd_puppet__certs
                             return
                             ;;
@@ -303,7 +303,7 @@ _comp_cmd_puppet()
                 *)
                     _comp_cmd_puppet__subcmd_opts "$1" "$subcommand"
                     # _parse_usage doesn't grok [-D|--daemonize|--no-daemonize]
-                    COMPREPLY+=($(compgen -W '--no-daemonize' -- "$cur"))
+                    _comp_compgen -a -- -W '--no-daemonize'
                     return
                     ;;
             esac
diff --git a/completions/pylint b/completions/pylint
@@ -57,7 +57,7 @@ _comp_cmd_pylint()
             ;;
         --disable | -${noargopts}d)
             _comp_cmd_pylint__message_ids "$1" Enabled
-            COMPREPLY+=($(compgen -W 'all' -- "$cur"))
+            _comp_compgen -a -- -W 'all'
             return
             ;;
         --rcfile)
diff --git a/completions/pytest b/completions/pytest
@@ -5,7 +5,7 @@ _comp_cmd_pytest__option_choice_args()
     local modes=$("${2:-pytest}" "$1=bash-completion-nonexistent" 2>&1 |
         command sed -e 's/[^[:space:][:alnum:]-]\{1,\}//g' \
             -ne 's/.*choose from //p')
-    COMPREPLY+=($(compgen -W '$modes' -- "$cur"))
+    _comp_compgen -a -- -W '$modes'
 }
 
 _comp_cmd_pytest()
diff --git a/completions/shellcheck b/completions/shellcheck
@@ -4,7 +4,7 @@ _comp_cmd_shellcheck__optarg()
 {
     local args=$("$1" --help 2>&1 |
         command sed -e 's/,/ /g' -ne 's/^.*'"$2"'\>.*(\([^)]*\)).*/\1/p')
-    COMPREPLY+=($(compgen -W '$args' -- "$cur"))
+    _comp_compgen -a -- -W '$args'
 }
 
 _comp_cmd_shellcheck()
@@ -42,7 +42,7 @@ _comp_cmd_shellcheck()
             ;;
         --source-path | -${noargopts}P)
             _comp_compgen_filedir -d
-            COMPREPLY+=($(compgen -W 'SCRIPTDIR' -- "$cur"))
+            _comp_compgen -a -- -W 'SCRIPTDIR'
             return
             ;;
         --wiki-link-count | -${noargopts}W)
diff --git a/completions/ssh b/completions/ssh
@@ -23,15 +23,15 @@ _comp_cmd_ssh__ciphers()
     [[ $ciphers ]] || ciphers="3des-cbc aes128-cbc aes192-cbc aes256-cbc
         aes128-ctr aes192-ctr aes256-ctr arcfour128 arcfour256 arcfour
         blowfish-cbc cast128-cbc"
-    COMPREPLY+=($(compgen -W "$ciphers" -- "$cur"))
+    _comp_compgen -a -- -W "$ciphers"
 }
 
 _comp_cmd_ssh__macs()
 {
     local macs=$(_comp_xfunc_ssh_query "$1" mac)
     [[ $macs ]] || macs="hmac-md5 hmac-sha1 umac-64@openssh.com hmac-ripemd160
         hmac-sha1-96 hmac-md5-96"
-    COMPREPLY+=($(compgen -W "$macs" -- "$cur"))
+    _comp_compgen -a -- -W "$macs"
 }
 
 _comp_xfunc_ssh_options()
@@ -352,7 +352,7 @@ _comp_cmd_ssh()
         _count_args "=" "-*[BbcDeLpRWEFSIiJlmOoQw]"
         if ((args > 1)); then
             compopt -o filenames
-            COMPREPLY+=($(compgen -c -- "$cur"))
+            _comp_compgen -a -- -c
         else
             _known_hosts_real ${ipvx-} -a ${configfile:+-F "$configfile"} \
                 -- "$cur"
diff --git a/completions/upgradepkg b/completions/upgradepkg
@@ -18,7 +18,7 @@ _comp_cmd_upgradepkg()
         compopt -o filenames
         COMPREPLY=($(compgen -P "$prev%" -f -X "!*.@(t[bgxl]z)" -- "$cur"))
         [[ ${COMPREPLY-} ]] || nofiles=set
-        COMPREPLY+=($(compgen -P "$prev%" -S '/' -d -- "$cur"))
+        _comp_compgen -a -- -P "$prev%" -S '/' -d
         [[ $nofiles ]] && compopt -o nospace
         return
     fi
diff --git a/completions/wodim b/completions/wodim
@@ -84,10 +84,10 @@ _comp_cmd_wodim()
     # files are always eligible completion
     _comp_compgen_filedir
     # track options are always available
-    COMPREPLY+=($(compgen -W '"${track_options[@]}"' -- "$cur"))
+    _comp_compgen -a -- -W '"${track_options[@]}"'
     # general options are no more available after file or track option
     if [[ ! $track_mode ]]; then
-        COMPREPLY+=($(compgen -W '"${generic_options[@]}"' -- "$cur"))
+        _comp_compgen -a -- -W '"${generic_options[@]}"'
     fi
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`_comp_xfunc_asciidoc_doctype()`
`4`	`4`	`{`
`5`		`- COMPREPLY+=($(compgen -W 'article book manpage' -- "$cur"))`
	`5`	`+ _comp_compgen -a -- -W 'article book manpage'`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`_comp_deprecate_func _asciidoc_doctype _comp_xfunc_asciidoc_doctype`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ _comp_cmd_chronyc__command_args()`
`9`	`9`	`\<address\>) _known_hosts_real -- "$cur" ;;`
`10`	`10`	`\<*) ;;`
`11`	`11`	`*) ((${#args[@]})) &&`
`12`		`- COMPREPLY+=($(compgen -W '"${args[@]}"' -- "$cur")) ;;`
	`12`	`+ _comp_compgen -a -- -W '"${args[@]}"' ;;`
`13`	`13`	`esac`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ _comp_cmd_dnssec_keygen__optarg()`
`6`	`6`	`command sed -e 's/\|/ /g' -e 's/(.*//' \`
`7`	`7`	`-ne '/^[[:space:]]'"$2"'/,/^[[:space:]][(-]/p' \|`
`8`	`8`	`command sed -e 's/^[[:space:]]'"$2"'.://' -e '/^[[:space:]]*-/d')`
`9`		`- COMPREPLY+=($(compgen -W '$args' -- "$cur"))`
	`9`	`+ _comp_compgen -a -- -W '$args'`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`_comp_cmd_dnssec_keygen()`