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

Author: akinomyoga

completions/dd

@@ -11,17 +11,15 @@ _comp_cmd_dd()
             return
             ;;
         conv=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'ascii ebcdic ibm block unblock lcase
-                ucase sparse swab sync excl nocreat notrunc noerror fdatasync
-                fsync' -- "$cur"))
+            _comp_compgen -c "${cur#*=}" -- -W 'ascii ebcdic ibm block unblock
+                lcase ucase sparse swab sync excl nocreat notrunc noerror
+                fdatasync fsync'
             return
             ;;
         iflag=* | oflag=*)
-            cur=${cur#*=}
-            COMPREPLY=($(compgen -W 'append direct directory dsync sync
-                fullblock nonblock noatime nocache noctty nofollow count_bytes
-                skip_bytes seek_bytes' -- "$cur"))
+            _comp_compgen -c "${cur#*=}" -- -W 'append direct directory dsync
+                sync fullblock nonblock noatime nocache noctty nofollow
+                count_bytes skip_bytes seek_bytes'
             return
             ;;
         status=*)

completions/gprof

@@ -15,9 +15,8 @@ _comp_cmd_gprof()
             return
             ;;
         -O*)
-            cur=${cur:2}
-            COMPREPLY=($(compgen -P -O -W 'auto bsd 4.4bsd magic prof' \
-                -- "$cur"))
+            _comp_compgen -c "${cur:2}" -- -P -O -W 'auto bsd 4.4bsd magic
+                prof'
             return
             ;;
     esac

completions/java

@@ -185,13 +185,13 @@ _comp_cmd_java()
             return
             ;;
         -Xgc:*)
-            COMPREPLY=($(compgen -W 'singlecon gencon singlepar genpar' \
-                -- "${cur#*:}"))
+            _comp_compgen -c "${cur#*:}" -- -W 'singlecon gencon singlepar
+                genpar'
             return
             ;;
         -Xgcprio:*)
-            COMPREPLY=($(compgen -W 'throughput pausetime deterministic' \
-                -- "${cur#*:}"))
+            _comp_compgen -c "${cur#*:}" -- -W 'throughput pausetime
+                deterministic'
             return
             ;;
         -Xloggc:* | -Xverboselog:*)
@@ -203,8 +203,8 @@ _comp_cmd_java()
             return
             ;;
         -Xverbose:*)
-            COMPREPLY=($(compgen -W 'memory load jni cpuinfo codegen opt
-                gcpause gcreport' -- "${cur#*:}"))
+            _comp_compgen -c "${cur#*:}" -- -W 'memory load jni cpuinfo codegen
+                opt gcpause gcreport'
             return
             ;;
         -Xverify:*)

completions/modinfo

@@ -9,10 +9,10 @@ _comp_cmd_modinfo()
     # shellcheck disable=SC2254
     case "$prev" in
         --field | -${noargopts}F)
-            COMPREPLY=($(compgen -W 'alias author depends description
+            _comp_compgen -c "${cur,,}" -- -W 'alias author depends description
                 filename firmware intree license name parm release_date
                 retpoline sig_hashalgo sig_key signat signer softdep srcversion
-                staging vermagic version' -- "${cur,,}"))
+                staging vermagic version'
             return
             ;;
         --set-version | -${noargopts}k)

completions/pylint

@@ -84,8 +84,8 @@ _comp_cmd_pylint()
         --confidence)
             local prefix=
             [[ $cur == *,* ]] && prefix="${cur%,*},"
-            COMPREPLY=($(compgen -W "HIGH INFERENCE INFERENCE_FAILURE
-                UNDEFINED" -- "${cur##*,}"))
+            _comp_compgen -c "${cur##*,}" -- -W "HIGH INFERENCE
+                INFERENCE_FAILURE UNDEFINED"
             ((${#COMPREPLY[@]} == 1)) && COMPREPLY=(${COMPREPLY/#/$prefix})
             return
             ;;

completions/pytest

@@ -114,8 +114,8 @@ _comp_cmd_pytest()
             fi
         done 2>/dev/null <"$file"
         ((!${#COMPREPLY[@]})) ||
-            COMPREPLY=($(compgen -P "$file::$class::" -W '"${COMPREPLY[@]}"' \
-                -- "${cur##*:?(:)}"))
+            _comp_compgen -c "${cur##*:?(:)}" -- -P "$file::$class::" \
+                -W '"${COMPREPLY[@]}"'
         _comp_ltrim_colon_completions "$cur"
         return
     elif [[ $cur == *.py:* ]]; then
@@ -128,8 +128,8 @@ _comp_cmd_pytest()
             fi
         done 2>/dev/null <"$file"
         ((!${#COMPREPLY[@]})) ||
-            COMPREPLY=($(compgen -P "$file::" -W '"${COMPREPLY[@]}"' \
-                -- "${cur##*.py:?(:)}"))
+            _comp_compgen -c "${cur##*.py:?(:)}" -- -P "$file::" \
+                -W '"${COMPREPLY[@]}"'
         _comp_ltrim_colon_completions "$cur"
         return
     fi

completions/rdesktop

@@ -27,8 +27,7 @@ _comp_cmd_rdesktop()
         -*r)
             case $cur in
                 sound:*)
-                    COMPREPLY=($(compgen -W 'local off remote' \
-                        -- "${cur#sound:}"))
+                    _comp_compgen -c "${cur#sound:}" -- -W 'local off remote'
                     ;;
                 *:*) ;;
 

completions/tshark

@@ -26,8 +26,8 @@ _comp_cmd_tshark()
                     _comp_cmd_tshark__prefs="$("$1" -G defaultprefs 2>/dev/null | command sed -ne 's/^#\{0,1\}\([a-z0-9_.-]\{1,\}:\).*/\1/p' |
                         tr '\n' ' ')"
                 : ${prefix:=}
-                COMPREPLY=($(compgen -P "$prefix" -W "$_comp_cmd_tshark__prefs" \
-                    -- "${cur:${#prefix}}"))
+                _comp_compgen -c "${cur:${#prefix}}" -- -P "$prefix" \
+                    -W "$_comp_cmd_tshark__prefs"
                 [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             fi
             return
@@ -103,8 +103,8 @@ _comp_cmd_tshark()
             if [[ ${cur:${#prefix}} == lua_script:* ]]; then
                 _comp_compgen -c "${cur#*:}" filedir lua
             else
-                COMPREPLY=($(compgen -P "$prefix" -W 'lua_script:' -- \
-                    "${cur:${#prefix}}"))
+                _comp_compgen -c "${cur:${#prefix}}" -- -P "$prefix" \
+                    -W 'lua_script:'
                 [[ ${COMPREPLY-} == *: ]] && compopt -o nospace
             fi
             return

completions/wget

@@ -49,9 +49,9 @@ _comp_cmd_wget()
             local lastopt=${cur/*,/} prevopt=
             [[ $cur == *,* ]] && prevopt=${cur%,*},
 
-            COMPREPLY=($(compgen -P "$prevopt" -X "@($excludes_str)" \
-                -W 'unix windows nocontrol ascii lowercase uppercase' \
-                -- "$lastopt"))
+            _comp_compgen -c "$lastopt" -- -P "$prevopt" \
+                -X "@($excludes_str)" \
+                -W 'unix windows nocontrol ascii lowercase uppercase'
 
             # +o nospace when no more valid option is possible (= append a space)
             local opt_as_arr=(${COMPREPLY[0]//,/ })
@@ -89,15 +89,15 @@ _comp_cmd_wget()
             local lastopt=${cur/*,/} prevopt=
             [[ $cur == *,* ]] && prevopt=${cur%,*},
 
-            COMPREPLY=($(compgen -P "$prevopt" -W 'a abbr acronym address
-                applet area b base basefont bdo big blockquote body br button
-                caption center cite code col colgroup dd del dir div dfn dl dt
-                em fieldset font form frame frameset h6 head hr html i iframe
-                img input ins isindex kbd label legend li link map menu meta
-                noframes noscript object ol optgroup option p param pre q s
-                samp script select small span strike strong style sub sup table
-                tbody td textarea tfoot th thead title tr tt u ul var xmp' \
-                -- "$lastopt"))
+            _comp_compgen -c "$lastopt" -- -P "$prevopt" -W 'a abbr acronym
+                address applet area b base basefont bdo big blockquote body br
+                button caption center cite code col colgroup dd del dir div dfn
+                dl dt em fieldset font form frame frameset h6 head hr html i
+                iframe img input ins isindex kbd label legend li link map menu
+                meta noframes noscript object ol optgroup option p param pre q
+                s samp script select small span strike strong style sub sup
+                table tbody td textarea tfoot th thead title tr tt u ul var
+                xmp'
             return
             ;;
         --tries | --timeout | --dns-timeout | --connect-timeout | \

completions/xgamma

@@ -33,8 +33,7 @@ _comp_cmd_xgamma()
                 local t screens=$(xrandr --query 2>/dev/null | command sed -ne \
                     '/^Screen /s|^Screen \{1,\}\(.*\):.*$|\1|p' 2>/dev/null)
                 t="${cur#:}"
-                COMPREPLY=($(compgen -P "${t%.*}." -W '$screens' -- \
-                    "${cur##*.}"))
+                _comp_compgen -c "${cur##*.}" -- -P "${t%.*}." -W '$screens'
             elif [[ $cur != *:* ]]; then
                 # complete hostnames
                 _known_hosts_real -c -- "$cur"