refactor: use _comp_compgen_help with temp vars

Author: akinomyoga

completions/bzip2

@@ -18,9 +18,9 @@ _comp_cmd_bzip2()
     esac
 
     if [[ $cur == -* ]]; then
-        local helpopts=$(_parse_help "$1")
-        COMPREPLY=($(compgen -W "${helpopts//#/} -2 -3 -4 -5 -6 -7 -8 -9" \
-            -- "$cur"))
+        local helpopts
+        _comp_compgen -Rv helpopts help
+        _comp_compgen -- -W '${helpopts[*]//#/} -{2..9}'
         return
     fi
 

completions/complete

@@ -37,7 +37,8 @@ _comp_cmd_complete()
     esac
 
     if [[ $cur == -* ]]; then
-        local -a opts=($(compgen -W '$(_parse_usage help "-s $1")' -- "$cur"))
+        local -a opts
+        _comp_compgen -v opts usage -c help -s "$1"
         # -F, -C do not work the expected way with compgen
         [[ $1 != *compgen ]] || opts=("${opts[@]//-[FC]/}")
         _comp_compgen -- -W '"${opts[@]}"' -X ''

completions/declare

@@ -7,7 +7,7 @@ _comp_cmd_declare()
 
     if [[ $cur == [-+]* ]]; then
         local opts
-        opts=($(_parse_usage help "-s $1"))
+        _comp_compgen -Rv opts usage -c help -s "$1"
         # Most options also have a '+' form.
         # We'll exclude the ones that don't with compgen.
         opts+=(${opts[*]/-/+})

completions/gnokii

@@ -221,20 +221,21 @@ _comp_cmd_gnokii()
         esac
     fi
 
-    local all_cmd="$(_parse_help "$1" "--help all")"
+    local all_cmd
+    _comp_compgen -Rv all_cmd help -- --help all
 
     # these 2 below are allowed in combination with others
     local main_cmd
-    _comp_split -l main_cmd "$(command sed -e '/--config/d;/--phone/d' -e \
-        's/[][\(){}|^$*+?.]/\\&/g' <<<"$all_cmd")"
+    _comp_split -l main_cmd "$(printf '%s\n' "${all_cmd[@]}" |
+        command sed -e '/--config/d;/--phone/d;s/[][\(){}|^$*+?.]/\\&/g')"
     # don't provide main command completions if one is
     # already on the command line
     local IFS='|'
     local regex_main_cmd="(${main_cmd[*]})($|[^_[:alnum:]])"
     IFS=$' \t\n'
     [[ $COMP_LINE =~ $regex_main_cmd ]] && return
 
-    _comp_compgen -- -W "$all_cmd"
+    _comp_compgen -- -W '"${all_cmd[@]}"'
 } &&
     complete -F _comp_cmd_gnokii gnokii
 

completions/id

@@ -6,9 +6,8 @@ _comp_cmd_id()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        local opts=$(_parse_help "$1")
-        [[ $opts ]] || opts="-G -g -u" # POSIX fallback
-        _comp_compgen -- -W "$opts"
+        _comp_compgen_help ||
+            _comp_compgen -- -W '-G -g -u' # POSIX fallback
     else
         COMPREPLY=($(compgen -u "$cur"))
     fi

completions/mktemp

@@ -20,9 +20,8 @@ _comp_cmd_mktemp()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        local opts=$(_parse_help "$1")
-        [[ $opts ]] || opts="-d -u -q -p -t" # non-GNU fallback
-        _comp_compgen -- -W "$opts"
+        _comp_compgen_help ||
+            _comp_compgen -- -W '-d -u -q -p -t' # non-GNU fallback
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&

completions/mysql

@@ -78,10 +78,8 @@ _comp_cmd_mysql()
 
     case $cur in
         --*)
-            local help=$(_parse_help "$1")
-            help+=" --skip-comments --skip-ssl"
-
-            _comp_compgen -- -W "$help"
+            _comp_compgen_help
+            _comp_compgen -a -- -W '--skip-comments --skip-ssl'
             [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
             return
             ;;

completions/openssl

@@ -41,7 +41,7 @@ _comp_cmd_openssl()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
-    local commands command options formats
+    local commands command formats
 
     commands='asn1parse ca ciphers crl crl2pkcs7 dgst dh dhparam dsa dsaparam
         ec ecparam enc engine errstr gendh gendsa genrsa nseq ocsp passwd
@@ -117,11 +117,13 @@ _comp_cmd_openssl()
 
         if [[ $cur == -* ]]; then
             # possible options for the command
-            options=$(_parse_help "$1" "$command -help" 2>/dev/null)
+            _comp_compgen_help -- "$command" -help
             case $command in
-                dgst | req | x509) options+=" $(_openssl_digests "$1")" ;;
+                dgst | req | x509)
+                    local options=$(_openssl_digests "$1")
+                    _comp_compgen -a -- -W '$options'
+                    ;;
             esac
-            _comp_compgen -- -W "$options"
         else
             if [[ $command == speed ]]; then
                 COMPREPLY=($(compgen -W 'md2 mdc2 md5 hmac sha1 rmd160

completions/pwdx

@@ -12,9 +12,8 @@ _comp_cmd_pwdx()
     esac
 
     if [[ $cur == -* ]]; then
-        local help=$(_parse_help "$1")
-        [[ $help ]] || help=-V
-        _comp_compgen -- -W '$help'
+        _comp_compgen_help ||
+            _comp_compgen -- -W '-V'
     else
         _pids
     fi

completions/rdesktop

@@ -46,7 +46,8 @@ _comp_cmd_rdesktop()
     esac
 
     if [[ $cur == -* ]]; then
-        local opts=($(_parse_help "$1"))
+        local -a opts
+        _comp_compgen -Rv opts help
         ((${#opts[@]})) &&
             _comp_compgen -- -W '"${opts[@]%:}"'
     else