refactor: use _comp_compgen_{help,usage} with arguments

Author: akinomyoga

completions/_udevadm

@@ -67,8 +67,7 @@ _comp_cmd_udevadm()
     fi
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W \
-            '$(_parse_help "$1" "${udevcmd-} --help")' -- "$cur"))
+        _comp_compgen_help -- ${has_udevcmd:+"$udevcmd"} --help
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     fi
 } &&

completions/alias

@@ -19,7 +19,7 @@ _comp_cmd_alias()
     esac
 
     if [[ $cur == -* ]]; then
-        _comp_compgen_usage help "-s $1"
+        _comp_compgen_usage -c help -s "$1"
         ((${#COMPREPLY[*]} != 1)) || compopt +o nospace
     fi
 } &&

completions/asciidoc

@@ -43,8 +43,7 @@ _comp_cmd_asciidoc()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help manpage")' \
-            -- "$cur"))
+        _comp_compgen_help -- --help manpage
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi

completions/bind

@@ -25,7 +25,7 @@ _comp_cmd_bind()
     esac
 
     if [[ $cur == -* ]]; then
-        _comp_compgen_usage help "-s $1"
+        _comp_compgen_usage -c help -s "$1"
         return
     fi
 

completions/cd

@@ -8,8 +8,7 @@ _comp_cmd_cd()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        local cmd=$1
-        _comp_compgen -- -W '$(_parse_help help "$cmd")'
+        _comp_compgen_help -c help "$1"
         compopt +o nospace
         return
     fi

completions/cfrun

@@ -38,7 +38,7 @@ _comp_cmd_cfrun()
             fi
             ;;
         2)
-            COMPREPLY=($(compgen -W '$(_parse_help cfagent)' -- "$cur"))
+            _comp_compgen_help -c cfagent --help
             ;;
     esac
 } &&

completions/curl

@@ -158,7 +158,7 @@ _comp_cmd_curl()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help all")' -- "$cur"))
+        _comp_compgen_help -- --help all
         [[ ${COMPREPLY-} ]] ||
             COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur"))
     fi

completions/cvs

@@ -29,7 +29,7 @@ _cvs_commands()
 
 _comp_cmd_cvs__command_options()
 {
-    COMPREPLY=($(compgen -W '$(_parse_help "$1" "--help $2")' -- "$cur"))
+    _comp_compgen_help -- --help "$2"
 }
 
 _comp_cmd_cvs__kflags()

completions/help

@@ -6,7 +6,7 @@ _comp_cmd_help()
     _comp_initialize -- "$@" || return
 
     if [[ $cur == -* ]]; then
-        _comp_compgen_usage "$1" "-s $1"
+        _comp_compgen_usage -c help -s "$1"
         return
     fi
 

completions/kill

@@ -18,7 +18,7 @@ _comp_cmd_kill()
     if [[ $cword -eq 1 && $cur == -* ]]; then
         # return list of available signals
         _signals -
-        COMPREPLY+=($(compgen -W '$(_parse_help help "$1")' -- "$cur"))
+        _comp_compgen -a help -c help "$1"
     else
         # return list of available PIDs and jobs
         _pids