Merge pull request #955 from akinomyoga/_comp_compgen-1

fix: use _comp_compgen for `COMPREPLY=($(compgen ...))`

Author: scop

bash_completion

@@ -533,8 +533,7 @@ _comp_compgen()
 
     local _result
     _result=$(
-        IFS=$_ifs
-        compgen "$@" ${_cur:+-- "$_cur"}
+        IFS=$_ifs compgen "$@" ${_cur:+-- "$_cur"}
     ) || {
         local _status=$?
         if [[ $_append ]]; then

completions/7z

@@ -6,7 +6,7 @@ _comp_cmd_7z()
     _comp_initialize -n = -- "$@" || return
 
     if ((cword == 1)); then
-        COMPREPLY=($(compgen -W 'a b d e h i l rn t u x' -- "$cur"))
+        _comp_compgen -- -W 'a b d e h i l rn t u x'
         return
     fi
 
@@ -15,7 +15,7 @@ _comp_cmd_7z()
 
     case $cur in
         -ao*)
-            COMPREPLY=($(compgen -P"${cur:0:3}" -W 'a s t u' -- "${cur:3}"))
+            _comp_compgen -c "${cur:3}" -- -P"${cur:0:3}" -W 'a s t u'
             return
             ;;
         -?(a)[ix]*)
@@ -29,35 +29,27 @@ _comp_cmd_7z()
                 COMPREPLY=($(compgen -P"$opt" -W '@ ! r@ r-@ r0@ r! r-! r0!' \
                     -- "$cur"))
             elif [[ $cur == ?(r@(-|0|))@* ]]; then
-                local IFS=$' \t\n' reset=$(shopt -po noglob)
-                set -o noglob
-                COMPREPLY=($(compgen -P"${opt}${cur%%@*}@" -f -- "${cur#*@}"))
-                $reset
+                _comp_compgen -c "${cur#*@}" -- -P"${opt}${cur%%@*}@" -f
                 compopt -o filenames
             fi
             return
             ;;
         -mhe=* | -mhc=* | -ms=* | -mt=*)
-            COMPREPLY=($(compgen -W 'on off' -- "${cur#*=}"))
+            _comp_compgen -c "${cur#*=}" -- -W 'on off'
             return
             ;;
         -mx=*)
-            COMPREPLY=($(compgen -W '0 1 3 5 7 9' -- "${cur#*=}"))
+            _comp_compgen -c "${cur#*=}" -- -W '0 1 3 5 7 9'
             return
             ;;
         -o* | -w?*)
-            local reset=$(shopt -po noglob)
-            set -o noglob
             compopt -o filenames
-            local IFS=$'\n'
-            COMPREPLY=($(compgen -d -P"${cur:0:2}" -S/ -- "${cur:2}"))
-            _comp_unlocal IFS
-            $reset
+            _comp_compgen -c "${cur:2}" -- -d -P"${cur:0:2}" -S/
             compopt -o nospace
             return
             ;;
         -r?*)
-            COMPREPLY=($(compgen -P"${cur:0:2}" -W '- 0' -- "${cur:2}"))
+            _comp_compgen -c "${cur:2}" -- -P"${cur:0:2}" -W '- 0'
             return
             ;;
         -scs*)
@@ -66,7 +58,7 @@ _comp_cmd_7z()
             return
             ;;
         -ssc?*)
-            COMPREPLY=($(compgen -P"${cur:0:4}" -W '-' -- "${cur:4}"))
+            _comp_compgen -c "${cur:4}" -- -P"${cur:0:4}" -W '-'
             return
             ;;
         -t*)

completions/_adb

@@ -44,7 +44,7 @@ _comp_cmd_adb()
             tmp+=(devices connect disconnect sideload)
         fi
         ((${#tmp[@]})) &&
-            COMPREPLY=($(compgen -W '"${tmp[@]}"' -- "$cur"))
+            _comp_compgen -- -W '"${tmp[@]}"'
         return
     fi
 
@@ -62,7 +62,7 @@ _comp_cmd_adb()
                     _parse_help -)' -- "$cur"))
             ;;
         reboot)
-            COMPREPLY=($(compgen -W 'bootloader recovery' -- "$cur"))
+            _comp_compgen -- -W 'bootloader recovery'
             ;;
     esac
 } &&

completions/_cal

@@ -11,7 +11,7 @@ _comp_cmd_cal()
     case $prev in
         -m)
             if [[ $OSTYPE == *bsd* ]]; then
-                COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
+                _comp_compgen -- -W '{1..12}'
                 return
             fi
             ;;
@@ -32,7 +32,7 @@ _comp_cmd_cal()
 
     local args
     _count_args
-    ((args == 1)) && COMPREPLY=($(compgen -W '{1..12}' -- "$cur"))
+    ((args == 1)) && _comp_compgen -- -W '{1..12}'
 } &&
     complete -F _comp_cmd_cal cal ncal
 

completions/_dmesg

@@ -20,7 +20,7 @@ _comp_cmd_dmesg()
             return
             ;;
         -l | --level | -n | --console-level)
-            COMPREPLY=($(compgen -W '{1..8}' -- "$cur"))
+            _comp_compgen -- -W '{1..8}'
             return
             ;;
     esac

completions/_eject

@@ -13,7 +13,7 @@ _comp_cmd_eject()
             return
             ;;
         -a | --auto | -i | --manualeject)
-            COMPREPLY=($(compgen -W 'on off' -- "$cur"))
+            _comp_compgen -- -W 'on off'
             return
             ;;
     esac

completions/_ionice

@@ -37,11 +37,11 @@ _comp_cmd_ionice()
 
     case $prev in
         -c)
-            COMPREPLY=($(compgen -W '{0..3}' -- "$cur"))
+            _comp_compgen -- -W '{0..3}'
             return
             ;;
         -n)
-            COMPREPLY=($(compgen -W '{0..7}' -- "$cur"))
+            _comp_compgen -- -W '{0..7}'
             return
             ;;
         -p)

completions/_mock

@@ -50,7 +50,7 @@ _comp_cmd_mock()
             return
             ;;
         --enable-plugin | --disable-plugin)
-            COMPREPLY=($(compgen -W "$plugins" -- "$cur"))
+            _comp_compgen -- -W "$plugins"
             return
             ;;
     esac

completions/_modules

@@ -60,7 +60,7 @@ _comp_cmd_module()
         options="$(module help 2>&1 | command grep -E '^[[:space:]]*\+' |
             awk '{print $2}' | command sed -e 's/|/ /g' | sort)"
 
-        COMPREPLY=($(compgen -W "$options" -- "$cur"))
+        _comp_compgen -- -W "$options"
 
     elif ((cword == 2)); then
         case $prev in

completions/_mount.linux

@@ -32,7 +32,7 @@ _comp_cmd_mount()
             return
             ;;
         -p | --pass-fd)
-            COMPREPLY=($(compgen -W '{0..9}'))
+            _comp_compgen -R -- -W '{0..9}'
             compopt -o nospace
             return
             ;;
@@ -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