refactor: use _comp_compgen_split for -W '$(...)'

Author: akinomyoga

bash_completion

@@ -1183,7 +1183,7 @@ _comp_variable_assignments()
             _terms
             ;;
         LANG | LC_*)
-            _comp_compgen -- -W '$(locale -a 2>/dev/null)'
+            _comp_compgen_split -- "$(locale -a 2>/dev/null)"
             ;;
         LANGUAGE)
             _comp_delimited : -W '$(locale -a 2>/dev/null)'
@@ -1576,7 +1576,7 @@ _ip_addresses()
 # TODO:API: rename per conventions
 _kernel_versions()
 {
-    _comp_compgen -- -W '$(command ls /lib/modules)'
+    _comp_compgen_split -- "$(command ls /lib/modules)"
 }
 
 # This function completes on all available network interfaces
@@ -1694,26 +1694,26 @@ if [[ $OSTYPE == *@(solaris|aix)* ]]; then
     # This function completes on process IDs.
     _pids()
     {
-        _comp_compgen -- -W '$(command ps -efo pid | command sed 1d)'
+        _comp_compgen_split -- "$(command ps -efo pid | command sed 1d)"
     }
 
     _pgids()
     {
-        _comp_compgen -- -W '$(command ps -efo pgid | command sed 1d)'
+        _comp_compgen_split -- "$(command ps -efo pgid | command sed 1d)"
     }
     _pnames()
     {
-        _comp_compgen -- -X '<defunct>' -W '$(command ps -efo comm | \
-            command sed -e 1d -e "s:.*/::" -e "s/^-//" | sort -u)'
+        _comp_compgen_split -X '<defunct>' -- "$(command ps -efo comm |
+            command sed -e 1d -e 's:.*/::' -e 's/^-//' | sort -u)"
     }
 else
     _pids()
     {
-        _comp_compgen -- -W '$(command ps ax -o pid=)'
+        _comp_compgen_split -- "$(command ps ax -o pid=)"
     }
     _pgids()
     {
-        _comp_compgen -- -W '$(command ps ax -o pgid=)'
+        _comp_compgen_split -- "$(command ps ax -o pgid=)"
     }
     # @param $1 if -s, don't try to avoid truncated command names
     _pnames()
@@ -1772,12 +1772,12 @@ fi
 _uids()
 {
     if type getent &>/dev/null; then
-        _comp_compgen -- -W '$(getent passwd | cut -d: -f3)'
+        _comp_compgen_split -- "$(getent passwd | cut -d: -f3)"
     elif type perl &>/dev/null; then
-        _comp_compgen -- -W '$(perl -e '"'"'while (($uid) = (getpwent)[2]) { print $uid . "\n" }'"'"')'
+        _comp_compgen_split -- "$(perl -e 'while (($uid) = (getpwent)[2]) { print $uid . "\n" }')"
     else
         # make do with /etc/passwd
-        _comp_compgen -- -W '$(cut -d: -f3 /etc/passwd)'
+        _comp_compgen_split -- "$(cut -d: -f3 /etc/passwd)"
     fi
 }
 
@@ -1787,12 +1787,12 @@ _uids()
 _gids()
 {
     if type getent &>/dev/null; then
-        _comp_compgen -- -W '$(getent group | cut -d: -f3)'
+        _comp_compgen_split -- "$(getent group | cut -d: -f3)"
     elif type perl &>/dev/null; then
-        _comp_compgen -- -W '$(perl -e '"'"'while (($gid) = (getgrent)[2]) { print $gid . "\n" }'"'"')'
+        _comp_compgen_split -- "$(perl -e 'while (($gid) = (getgrent)[2]) { print $gid . "\n" }')"
     else
         # make do with /etc/group
-        _comp_compgen -- -W '$(cut -d: -f3 /etc/group)'
+        _comp_compgen_split -- "$(cut -d: -f3 /etc/group)"
     fi
 }
 
@@ -1862,9 +1862,9 @@ _service()
     else
         local sysvdirs
         _comp_sysvdirs
-        _comp_compgen -l -- -W '$(command sed -e "y/|/ /" \
-            -ne "s/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p" \
-            "${sysvdirs[0]}/${prev##*/}" 2>/dev/null) start stop'
+        _comp_compgen_split -l -- "$(command sed -e 'y/|/ /' \
+            -ne 's/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p' \
+            "${sysvdirs[0]}/${prev##*/}" 2>/dev/null) start stop"
     fi
 } &&
     complete -F _service service
@@ -1980,9 +1980,8 @@ _allowed_groups()
 # @since 2.12
 _comp_selinux_users()
 {
-    _comp_compgen -a -- -W '$(
-        semanage user -nl 2>/dev/null | awk "{ print \$1 }"
-    )'
+    _comp_compgen -a split -- "$(semanage user -nl 2>/dev/null |
+        awk '{ print $1 }')"
 }
 
 # This function completes on valid shells

completions/_look

@@ -9,7 +9,7 @@ _comp_cmd_look()
     _comp_initialize -- "$@" || return
 
     if ((cword == 1)); then
-        COMPREPLY=($(compgen -W '$(look "$cur" 2>/dev/null)' -- "$cur"))
+        _comp_compgen_split -- "$(look "$cur" 2>/dev/null)"
     fi
 } &&
     complete -F _comp_cmd_look -o default look

completions/_umount

@@ -16,8 +16,7 @@ _comp_cmd_umount()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local IFS=$'\n'
-    COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur"))
+    _comp_compgen_split -l -- "$(mount | cut -d" " -f 3)"
 } &&
     complete -F _comp_cmd_umount -o dirnames umount
 

completions/_umount.linux

@@ -130,8 +130,7 @@ _comp_cmd_umount()
         # unmounting usb devices with pretty names.
         _comp_cmd_umount__linux_fstab </proc/mounts
     else
-        local IFS=$'\n'
-        COMPREPLY=($(compgen -W '$(mount | cut -d" " -f 3)' -- "$cur"))
+        _comp_compgen_split -l -- "$(mount | cut -d" " -f 3)"
     fi
 } &&
     complete -F _comp_cmd_umount -o dirnames umount

completions/_xm

@@ -185,9 +185,9 @@ _comp_cmd_xm()
                     ;;
                 create)
                     _comp_compgen_filedir
-                    COMPREPLY+=(
-                        $(compgen -W '$(command ls /etc/xen 2>/dev/null)' \
-                            -- "$cur"))
+                    _comp_compgen -a split -- "$(
+                        command ls /etc/xen 2>/dev/null
+                    )"
                     ;;
                 new)
                     case $prev in

completions/_yum

@@ -105,17 +105,16 @@ _comp_cmd_yum()
             _comp_compgen_filedir -d
             ;;
         --enablerepo)
-            COMPREPLY=($(compgen -W '$(_yum_repolist disabled)' -- "$cur"))
+            _comp_compgen_split -- "$(_yum_repolist disabled)"
             ;;
         --disablerepo)
-            COMPREPLY=($(compgen -W '$(_yum_repolist enabled)' -- "$cur"))
+            _comp_compgen_split -- "$(_yum_repolist enabled)"
             ;;
         --disableexcludes)
-            COMPREPLY=($(compgen -W '$(_yum_repolist all) all main' \
-                -- "$cur"))
+            _comp_compgen_split -- "$(_yum_repolist all) all main"
             ;;
         --enableplugin | --disableplugin)
-            COMPREPLY=($(compgen -W '$(_yum_plugins)' -- "$cur"))
+            _comp_compgen_split -- "$(_yum_plugins)"
             ;;
         --color)
             _comp_compgen -- -W 'always auto never'

completions/apt-cache

@@ -36,7 +36,10 @@ _comp_cmd_apt_cache__sources()
 # @since 2.12
 _comp_xfunc_apt_cache_src_packages()
 {
-    compgen -W '$(_comp_cmd_apt_cache__sources apt-cache "$cur")' -- "$cur"
+    local ret
+    _comp_compgen -v ret split -- \
+        "$(_comp_cmd_apt_cache__sources apt-cache "$cur")" &&
+        printf '%s\n' "${ret[@]}"
 }
 
 _comp_deprecate_func 2.12 _apt_cache_packages _comp_xfunc_apt_cache_packages

completions/avahi-browse

@@ -34,7 +34,7 @@ _comp_cmd_avahi_browse()
                 ;;
         esac
     done
-    COMPREPLY=($(compgen -W '$("$1" --dump-db --no-db-lookup)' -- "$cur"))
+    _comp_compgen_split -- "$("$1" --dump-db --no-db-lookup)"
 
 } &&
     complete -F _comp_cmd_avahi_browse avahi-browse avahi-browse-domains

completions/bind

@@ -19,7 +19,7 @@ _comp_cmd_bind()
             return
             ;;
         -*[qu])
-            COMPREPLY=($(compgen -W '$("$1" -l)' -- "$cur"))
+            _comp_compgen_split -- "$("$1" -l)"
             return
             ;;
     esac

completions/bts

@@ -18,7 +18,8 @@ _comp_cmd_bts__cached_bugs()
 _comp_cmd_bts__src_packages_with_prefix()
 {
     local ppn=${cur:4} # partial package name, after stripping "src:"
-    _comp_compgen -ac "$ppn" -- -P "src:" -W '$(_comp_xfunc apt-cache sources "$ppn")'
+    _comp_compgen -ac "$ppn" split -P "src:" -- \
+        "$(_comp_xfunc apt-cache sources "$ppn")"
 }
 
 _comp_cmd_bts()