fix: use _comp_compgen_split to split and filter words

Author: akinomyoga

completions/_slackpkg

@@ -81,13 +81,15 @@ _comp_cmd_slackpkg()
             _comp_compgen_filedir
             _comp_compgen -a -- -W 'a ap d e f k kde kdei l n t tcl x xap xfce
                 y'
-            COMPREPLY+=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
-                command grep "^$cur"))
+            _comp_compgen -a split -l -- "$(
+                cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null
+            )"
             return
             ;;
         info)
-            COMPREPLY=($(cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null |
-                command grep "^$cur"))
+            _comp_compgen_split "$(
+                cut -f 6 -d\  "${WORKDIR}/pkglist" 2>/dev/null
+            )"
             return
             ;;
         update)

completions/aptitude

@@ -52,9 +52,8 @@ _comp_cmd_aptitude()
             return
             ;;
         --target-release | --default-release | -${noargopts}t)
-            COMPREPLY=($(apt-cache policy |
-                command grep "release.o=Debian,a=$cur" |
-                command sed -e "s/.*a=\([_[:alnum:]]*\).*/\1/" | uniq 2>/dev/null))
+            _comp_compgen_split -l -- "$(apt-cache policy |
+                command sed -ne 's/.*release.o=Debian,a=\([_[:alnum:]]*\).*/\1/p')"
             return
             ;;
     esac

completions/isql

@@ -7,7 +7,9 @@ _comp_cmd_isql()
     _comp_initialize -- "$@" || return
 
     [[ -f ${ODBCINI-} ]] &&
-        COMPREPLY=($(command grep "\[$cur" "$ODBCINI" | tr -d \[\]))
+        _comp_compgen_split -l -- "$(
+            command sed -n 's/\]//g;s/^\[//gp' "$ODBCINI"
+        )"
 } &&
     complete -F _comp_cmd_isql isql
 

completions/postcat

@@ -22,13 +22,8 @@ _comp_cmd_postcat()
         [[ $idx == -q ]] && qfile=set && break
     done
     if [[ $qfile ]]; then
-        local len=${#cur} pval
-        for pval in $(mailq 2>/dev/null |
-            command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//'); do
-            if [[ $cur == "${pval:0:len}" ]]; then
-                COMPREPLY+=("$pval")
-            fi
-        done
+        _comp_compgen_split -- "$(mailq 2>/dev/null |
+            command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
         return
     fi
 

completions/postsuper

@@ -5,42 +5,25 @@ _comp_cmd_postsuper()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local pval len
-
     case $prev in
         -c)
             _comp_compgen_filedir -d
             return
             ;;
         -[dr])
-            len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null |
-                command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//'); do
-                if [[ $cur == "${pval:0:len}" ]]; then
-                    COMPREPLY+=($pval)
-                fi
-            done
+            _comp_compgen_split -- "ALL $(mailq 2>/dev/null |
+                command sed -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* !].*$//')"
             return
             ;;
         -h)
-            len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null |
+            _comp_compgen_split -- "ALL $(mailq 2>/dev/null |
                 command sed \
-                    -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* ].*$//; /!$/d'); do
-                if [[ $cur == "${pval:0:len}" ]]; then
-                    COMPREPLY+=($pval)
-                fi
-            done
+                    -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; s/[* ].*$//; /!$/d')"
             return
             ;;
         -H)
-            len=${#cur}
-            for pval in ALL $(mailq 2>/dev/null | command sed -e \
-                '1d; $d; /^[^0-9A-Z]/d; /^$/d; /^[0-9A-Z]*[* ]/d; s/!.*$//'); do
-                if [[ $cur == "${pval:0:len}" ]]; then
-                    COMPREPLY+=($pval)
-                fi
-            done
+            _comp_compgen_split -- "ALL $(mailq 2>/dev/null | command sed \
+                -e '1d; $d; /^[^0-9A-Z]/d; /^$/d; /^[0-9A-Z]*[* ]/d; s/!.*$//')"
             return
             ;;
     esac

completions/povray

@@ -51,10 +51,9 @@ _comp_cmd_povray()
             cur="${povcur#*\[}"
             pfx="${povcur%\["$cur"}" # prefix == filename
             [[ -f $pfx && -r $pfx ]] || return
-            COMPREPLY=($(command sed -ne \
-                's/^[[:space:]]*\[\('"$cur"'[^]]*\]\).*$/\1/p' -- "$pfx"))
-            # to prevent [bar] expand to nothing.  can be done more easily?
-            ((${#COMPREPLY[@]})) &&
+            _comp_compgen_split -l -- "$(command sed -ne \
+                's/^[[:space:]]*\[\([^]]*\]\).*$/\1/p' -- "$pfx")" &&
+                # to prevent [bar] expand to nothing.  can be done more easily?
                 _comp_compgen -Rv COMPREPLY -- -P "${pfx}[" -W '"${COMPREPLY[@]}"'
             return
             ;;

completions/sbopkg

@@ -61,10 +61,8 @@ _comp_cmd_sbopkg()
     local file=${REPO_ROOT-}/${REPO_NAME-}/${REPO_BRANCH-}/SLACKBUILDS.TXT
     [[ -f $file && -r $file ]] || return
 
-    COMPREPLY=($(
-        command sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p;}" \
-            "$file"
-    ))
+    _comp_compgen_split -l -- "$(command sed -ne "s/^SLACKBUILD NAME: //p" \
+        "$file")"
     _comp_compgen -aC "$QUEUEDIR" -- -f -X "!*.sqf"
 } &&
     complete -F _comp_cmd_sbopkg sbopkg

completions/wvdial

@@ -33,10 +33,8 @@ _comp_cmd_wvdial()
             done
             # parse config files for sections and
             # remove default section
-            COMPREPLY=($(
-                command sed -ne "s|^\[Dialer \($cur.*\)\]$|\1|p" "$config" \
-                    2>/dev/null | command grep -v '^Defaults$'
-            ))
+            _comp_compgen_split -l -X 'Defaults' -- "$(command sed -ne \
+                's/^\[Dialer \(.*\)\]$/\1/p' "$config" 2>/dev/null)"
             # escape spaces
             COMPREPLY=("${COMPREPLY[@]// /\\ }")
             ;;