refactor(completions/*): use _comp_split for arr=(...)

Author: akinomyoga

completions/_adb

@@ -39,7 +39,7 @@ _comp_cmd_adb()
             _comp_compgen -av tmp help -- help
         fi
         if [[ ! $cur || $cur != -* ]]; then
-            tmp+=($("$1" help 2>&1 | _comp_awk '$1 == "adb" { print $2 }'))
+            _comp_split -a tmp "$("$1" help 2>&1 | _comp_awk '$1 == "adb" { print $2 }')"
             tmp+=(devices connect disconnect sideload)
         fi
         ((${#tmp[@]})) &&

completions/curl

@@ -103,11 +103,9 @@ _comp_cmd_curl()
             return
             ;;
         --help | -${noargopts}h)
-            local x categories=(
-                $("$1" --help non-existent-category 2>&1 |
-                    _comp_awk '/^[ \t]/ {print $1}')
-            )
-            if ((${#categories[@]})); then
+            local x categories
+            if _comp_split categories "$("$1" --help non-existent-category 2>&1 |
+                _comp_awk '/^[ \t]/ {print $1}')"; then
                 for x in "${categories[@]}"; do
                     # Looks like an option? Likely no --help category support
                     [[ $x != -* ]] || return

completions/cvs

@@ -38,7 +38,7 @@ _comp_xfunc_cvs_compgen_roots()
 {
     local -a cvsroots=()
     [[ -v CVSROOT ]] && cvsroots=("$CVSROOT")
-    [[ -r ~/.cvspass ]] && cvsroots+=($(_comp_awk '{ print $2 }' ~/.cvspass))
+    [[ -r ~/.cvspass ]] && _comp_split -a cvsroots "$(_comp_awk '{ print $2 }' ~/.cvspass)"
     [[ -r CVS/Root ]] && mapfile -tO "${#cvsroots[@]}" cvsroots <CVS/Root
     ((${#cvsroots[@]})) &&
         _comp_compgen -U cvsroots -- -W '"${cvsroots[@]}"'

completions/fio

@@ -98,9 +98,8 @@ _comp_cmd_fio()
             return
             ;;
         --?*)
-            local IFS=$'\n'
-            local cmdhelp=($("$1" --cmdhelp="${prev#--}" 2>/dev/null))
-            _comp_unlocal IFS
+            local -a cmdhelp
+            _comp_split -l cmdhelp "$("$1" --cmdhelp="${prev#--}" 2>/dev/null)"
             case ${cmdhelp[*]-} in
                 *"showing closest match"*)
                     # ignore

completions/kldload

@@ -12,11 +12,8 @@ _comp_cmd_kldload()
         return
     fi
 
-    local moddirs modules i IFS=";"
-    moddirs=($(kldconfig -r 2>/dev/null))
-    _comp_unlocal IFS
-
-    if ((${#moddirs[@]})); then
+    local moddirs modules i
+    if _comp_split -F : moddirs "$(kldconfig -r 2>/dev/null)"; then
         compopt -o filenames
         for i in "${moddirs[@]}"; do
             _comp_compgen -v modules -c "$i/$cur" -- -f &&

completions/mplayer

@@ -57,8 +57,7 @@ _comp_cmd_mplayer()
             ;;
         -subcp | -msgcharset)
             local cp
-            cp=($(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null))
-            if ((${#cp[@]})); then
+            if _comp_split cp "$(iconv --list 2>/dev/null | command sed -e "s@//@@;" 2>/dev/null)"; then
                 if [[ $cur == "${cur,,}" ]]; then
                     _comp_compgen -- -W '"${cp[@],,}"'
                 else
@@ -80,7 +79,7 @@ _comp_cmd_mplayer()
             # may want to set the MPLAYER_SKINS_DIR global variable
             local -a dirs
             if [[ $MPLAYER_SKINS_DIR ]]; then
-                dirs=($MPLAYER_SKINS_DIR)
+                _comp_split dirs "$MPLAYER_SKINS_DIR"
             else
                 dirs=(/usr/share/mplayer/skins /usr/local/share/mplayer/skins)
             fi

completions/mutt

@@ -66,8 +66,9 @@ _comp_cmd_mutt__get_conffiles__visit()
     visited[$1]=set
     conffiles+=("$1")
 
-    local -a newconffiles=($(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$1"))
-    ((${#newconffiles[@]})) || return 0
+    local -a newconffiles
+    _comp_split newconffiles "$(command sed -n 's|^source[[:space:]]\{1,\}\([^[:space:]]\{1,\}\).*$|\1|p' "$1")" ||
+        return 0
 
     local file REPLY
     for file in "${newconffiles[@]}"; do

completions/screen

@@ -2,9 +2,9 @@
 
 _comp_cmd_screen__sessions()
 {
-    local sessions=($(command screen -ls | command sed -ne \
-        's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p'))
-    ((${#sessions[@]} == 0)) && return
+    local -a sessions
+    _comp_split sessions "$(command screen -ls | command sed -ne \
+        's|^\t\{1,\}\([0-9]\{1,\}\.[^\t]\{1,\}\).*'"$1"'.*$|\1|p')" || return
     if [[ $cur == +([0-9])?(.*) ]]; then
         # Complete sessions including pid prefixes
         _comp_compgen -- -W '"${sessions[@]}"'

completions/wget

@@ -54,7 +54,8 @@ _comp_cmd_wget()
                 -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]//,/ })
+            local -a opt_as_arr
+            _comp_split -F $', \t\n' opt_as_arr "${COMPREPLY[0]}"
             ((${#opt_as_arr[@]} < 4)) && compopt -o nospace
             return
             ;;