Merge pull request #972 from akinomyoga/_comp_compgen-3

fix: use `_comp_compgen` for simple cases

Author: scop

completions/bzip2

@@ -37,7 +37,7 @@ _comp_cmd_bzip2()
     _comp_compgen_tilde && return
 
     compopt -o filenames
-    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur") $(compgen -d -- "$cur"))
+    _comp_compgen -- -f -X "$xspec" -o plusdirs
 } &&
     complete -F _comp_cmd_bzip2 bzip2 pbzip2 lbzip2
 

completions/carton

@@ -4,7 +4,7 @@ _comp_cmd_carton__commands()
 {
     local cmds=$("${1:-carton}" usage 2>&1 |
         command sed -ne '/.*command.* is one of/{n;p;q;}')
-    COMPREPLY+=($(IFS=$' \t\n,' compgen -W "$cmds" -- "$cur"))
+    _comp_compgen -aF $' \t\n,' -- -W "$cmds"
 }
 
 _comp_cmd_carton__command_help()

completions/chronyc

@@ -3,8 +3,8 @@
 _comp_cmd_chronyc__command_args()
 {
     local -a args
-    args=($(compgen -W "$("$1" help 2>/dev/null |
-        awk '/^'"$prev"'\s[^ []/ { gsub("\\|", " ", $2); print $2 }')"))
+    _comp_split args "$("$1" help 2>/dev/null |
+        awk '/^'"$prev"'\s[^ []/ { gsub("\\|", " ", $2); print $2 }')"
     case $args in
         \<address\>) _known_hosts_real -- "$cur" ;;
         \<*) ;;

completions/dmypy

@@ -40,7 +40,7 @@ _comp_cmd_dmypy()
         local cmds=$("$1" --help 2>&1 |
             command sed -ne '/positional arguments/{p;n;p;q;}' |
             command sed -ne 's/{\(.*\)}/\1/p')
-        COMPREPLY=($(IFS="," compgen -W '$cmds' -- "$cur"))
+        _comp_compgen -F , -- -W '$cmds'
         return
     fi
 } &&

completions/find

@@ -36,7 +36,7 @@ _comp_cmd_find()
             return
             ;;
         -group)
-            COMPREPLY=($(compgen -g -- "$cur" 2>/dev/null))
+            _comp_compgen -- -g
             return
             ;;
         -xtype | -type)

completions/gcc

@@ -53,7 +53,7 @@ _comp_cmd_gcc()
         prefix_length=$((${#prefix} + 1))
         local flags=$("$1" --completion="$argument" | cut -c $prefix_length-)
         [[ ${flags} == "=*" ]] && compopt -o nospace 2>/dev/null
-        COMPREPLY=($(compgen -W "$flags" -- ""))
+        _comp_compgen -R -- -W "$flags"
     fi
 } &&
     complete -F _comp_cmd_gcc gcc{,-5,-6,-7,-8} g++{,-5,-6,-7,-8} g77 g95 \

completions/gdb

@@ -19,8 +19,8 @@ _comp_cmd_gdb()
         compopt -o filenames
         if _comp_looks_like_path "$cur"; then
             # compgen -c works as expected if $cur contains any slashes.
-            IFS=$'\n'
-            COMPREPLY=($(PATH="$PATH:." compgen -d -c -- "$cur"))
+            local PATH="$PATH:."
+            _comp_compgen -- -d -c
         else
             # otherwise compgen -c contains Bash's built-in commands,
             # functions and aliases. Thus we need to retrieve the program

completions/gssdp-discover

@@ -17,10 +17,7 @@ _comp_cmd_gssdp_discover()
             [[ $1 == *gssdp-discover ]] || return
             local types=$("$1" --help 2>&1 |
                 command sed -ne 's/^.*--message-type=.*(\([^)]*\))$/\1/p')
-            COMPREPLY=($(
-                IFS=$' \t\n,'
-                compgen -W "$types" -- "$cur"
-            ))
+            _comp_compgen -F $' \t\n,' -- -W "$types"
             return
             ;;
     esac

completions/gzip

@@ -39,8 +39,7 @@ _comp_cmd_gzip()
     _comp_compgen_tilde && return
 
     compopt -o filenames
-    COMPREPLY=($(compgen -f -X "$xspec" -- "$cur")
-    $(compgen -d -- "$cur"))
+    _comp_compgen -- -f -X "$xspec" -o plusdirs
 } &&
     complete -F _comp_cmd_gzip gzip pigz
 

completions/id

@@ -9,7 +9,7 @@ _comp_cmd_id()
         _comp_compgen_help ||
             _comp_compgen -- -W '-G -g -u' # POSIX fallback
     else
-        COMPREPLY=($(compgen -u "$cur"))
+        _comp_compgen -- -u
     fi
 } &&
     complete -F _comp_cmd_id id