refactor: use _comp_compgen_help with extra options

Author: akinomyoga

completions/chronyc

@@ -29,7 +29,8 @@ _comp_cmd_chronyc()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -6' -- "$cur"))
+        _comp_compgen_usage
+        _comp_compgen -a -- -W '-6'
         return
     fi
 

completions/cvs

@@ -408,9 +408,9 @@ _comp_cmd_cvs()
                     ;;
             esac
 
-            COMPREPLY=($(compgen -W '$(_cvs_commands)
-                $(_parse_help "$1" --help-options) --help --help-commands
-                --help-options --version' -- "$cur"))
+            _comp_compgen_help -- --help-options
+            _comp_compgen -a -- -W '$(_cvs_commands) --help
+                --help-commands --help-options --version'
             ;;
     esac
 

completions/dd

@@ -31,9 +31,9 @@ _comp_cmd_dd()
             ;;
     esac
 
-    COMPREPLY=($(compgen -W '$(_parse_help "$1")' -- "$cur")
-    $(compgen -W 'bs cbs conv count ibs if iflag obs of oflag
-                              seek skip status' -S '=' -- "$cur"))
+    _comp_compgen_help
+    _comp_compgen -a -- -W 'bs cbs conv count ibs if iflag obs of oflag
+        seek skip status' -S '='
     [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
 } &&
     complete -F _comp_cmd_dd dd

completions/dsniff

@@ -17,7 +17,8 @@ _comp_cmd_dsniff()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -r -w -p' -- "$cur"))
+        _comp_compgen_usage
+        _comp_compgen -a -- -W '-r -w -p'
     fi
 
 } &&

completions/ether-wake

@@ -16,7 +16,8 @@ _comp_cmd_ether_wake()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1" -u) -V' -- "$cur"))
+        _comp_compgen_help -- -u
+        _comp_compgen -a -- -W '-V'
         return
     fi
 

completions/export

@@ -46,7 +46,8 @@ _comp_cmd_export()
             ;;
         *)
             if [[ $cword -eq 1 && $cur == -* ]]; then
-                COMPREPLY=($(compgen -W '-p $(_parse_usage help "-s $1")' -- "$cur"))
+                _comp_compgen_usage -c help -s "$1"
+                _comp_compgen -a -- -W '-p'
                 return
             fi
             local suffix=""

completions/fio

@@ -140,13 +140,10 @@ _comp_cmd_fio()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(
-            compgen -W '
-                      $(_parse_help "$1")
-                      $("$1" --cmdhelp=all 2>/dev/null | \
-                             awk "{printf \"--%s=\n\", \$1}")
-            ' -- "$cur"
-        ))
+        _comp_compgen_help
+        local stdout=$("$1" --cmdhelp=all 2>/dev/null |
+            awk '{printf "--%s=\n", $1}')
+        _comp_compgen -a -- -W '$stdout'
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi

completions/gzip

@@ -19,7 +19,8 @@ _comp_cmd_gzip()
     esac
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1") {-1..-9}' -- "$cur"))
+        _comp_compgen_help
+        _comp_compgen -a -- -W '-{1..9}'
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
         return
     fi

completions/hddtemp

@@ -28,7 +28,8 @@ _comp_cmd_hddtemp()
     [[ $was_split ]] && return
 
     if [[ $cur == -* ]]; then
-        COMPREPLY=($(compgen -W '$(_parse_help "$1") --help' -- "$cur"))
+        _comp_compgen_help
+        _comp_compgen -a -- -W '--help'
         [[ ${COMPREPLY-} == *= ]] && compopt -o nospace
     else
         _comp_compgen -c "${cur:-/dev/}" filedir

completions/json_xs

@@ -23,8 +23,10 @@ _comp_cmd_json_xs()
             ;;
     esac
 
-    [[ $cur == -* ]] &&
-        COMPREPLY=($(compgen -W '$(_parse_usage "$1") -f' -- "$cur"))
+    if [[ $cur == -* ]]; then
+        _comp_compgen_usage
+        _comp_compgen -a -- -W '-f'
+    fi
 } &&
     complete -F _comp_cmd_json_xs json_xs