Merge pull request #862 from akinomyoga/reportbug-otherflags

fix(completions/*): skip `prev` of the form `-oOPTARG`

Author: scop

completions/a2x

@@ -5,16 +5,18 @@ _a2x()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
+    local noargopts='!(-*|*[aDd]*)'
+    # shellcheck disable=SC2254
     case $prev in
         --attribute | --asciidoc-opts | --dblatex-opts | --fop-opts | --help | \
-            --version | --xsltproc-opts | -!(-*)[ah])
+            --version | --xsltproc-opts | -${noargopts}[ah])
             return
             ;;
-        --destination-dir | --icons-dir | -!(-*)D)
+        --destination-dir | --icons-dir | -${noargopts}D)
             _filedir -d
             return
             ;;
-        --doctype | -!(-*)d)
+        --doctype | -${noargopts}d)
             _comp_xfunc asciidoc doctype
             return
             ;;

completions/acpi

@@ -5,11 +5,13 @@ _acpi()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
+    local noargopts='!(-*|*[d]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --help | --version | -!(-*)[hv])
+        --help | --version | -${noargopts}[hv])
             return
             ;;
-        --directory | -!(-*)d)
+        --directory | -${noargopts}d)
             _filedir -d
             return
             ;;

completions/apt-cache

@@ -56,8 +56,10 @@ _apt_cache()
         return
     fi
 
+    local noargopts='!(-*|*[cps]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --config-file | --pkg-cache | --src-cache | -!(-*)[cps])
+        --config-file | --pkg-cache | --src-cache | -${noargopts}[cps])
             _filedir
             return
             ;;

completions/apt-get

@@ -67,15 +67,17 @@ _apt_get()
         return
     fi
 
+    local noargopts='!(-*|*[eoct]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --error-on | --help | --version | --option | -!(-*)[ehvo])
+        --error-on | --help | --version | --option | -${noargopts}[ehvo])
             return
             ;;
-        --config-file | -!(-*)c)
+        --config-file | -${noargopts}c)
             _filedir
             return
             ;;
-        --target-release | --default-release | -!(-*)t)
+        --target-release | --default-release | -${noargopts}t)
             COMPREPLY=($(compgen -W "$(apt-cache policy | command sed -ne \
                 's/^ *release.*[ ,]o=\(Debian\|Ubuntu\),a=\(\w*\).*/\2/p')" \
                 -- "$cur"))

completions/apt-mark

@@ -33,15 +33,17 @@ _comp_cmd_apt_mark()
         return
     fi
 
+    local noargopts='!(-*|*[ocf]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --help | --version | --option | -!(-*)[hvo])
+        --help | --version | --option | -${noargopts}[hvo])
             return
             ;;
-        --config-file | -!(-*)c)
+        --config-file | -${noargopts}c)
             _filedir conf
             return
             ;;
-        --file | -!(-*)f)
+        --file | -${noargopts}f)
             _filedir
             return
             ;;

completions/aptitude

@@ -46,24 +46,26 @@ _aptitude()
         esac
     fi
 
+    local noargopts='!(-*|*[SwFoOt]*)'
+    # shellcheck disable=SC2254
     case $prev in
         # don't complete anything if these options are found
         autoclean | clean | forget-new | search | upgrade | update | keep-all)
             return
             ;;
-        -!(-*)S)
+        -${noargopts}S)
             _filedir
             return
             ;;
-        --display-format | --width | -!(-*)[wFo])
+        --display-format | --width | -${noargopts}[wFo])
             return
             ;;
-        --sort | -!(-*)O)
+        --sort | -${noargopts}O)
             COMPREPLY=($(compgen -W 'installsize installsizechange debsize
                 name priority version' -- "$cur"))
             return
             ;;
-        --target-release | --default-release | -!(-*)t)
+        --target-release | --default-release | -${noargopts}t)
             COMPREPLY=($(apt-cache policy |
                 command grep "release.o=Debian,a=$cur" |
                 command sed -e "s/.*a=\(\w*\).*/\1/" | uniq 2>/dev/null))

completions/arp

@@ -5,20 +5,22 @@ _arp()
     local cur prev words cword comp_args
     _comp_initialize -- "$@" || return
 
+    local noargopts='!(-*|*[iApfHt]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --device | -!(-*)i)
+        --device | -${noargopts}i)
             _available_interfaces -a
             return
             ;;
-        --protocol | -!(-*)[Ap])
+        --protocol | -${noargopts}[Ap])
             # TODO protocol/address family
             return
             ;;
-        --file | -!(-*)f)
+        --file | -${noargopts}f)
             _filedir
             return
             ;;
-        --hw-type | -!(-*)[Ht])
+        --hw-type | -${noargopts}[Ht])
             # TODO: parse from --help output?
             COMPREPLY=($(compgen -W 'ash ether ax25 netrom rose arcnet \
                 dlci fddi hippi irda x25 eui64' -- "$cur"))
@@ -34,7 +36,7 @@ _arp()
     fi
 
     local args
-    _count_args "" "@(--device|--protocol|--file|--hw-type|-!(-*)[iApfHt])"
+    _count_args "" "@(--device|--protocol|--file|--hw-type|-${noargopts}[iApfHt])"
     case $args in
         1)
             local ips=$("$1" -an | command sed -ne \

completions/asciidoc

@@ -12,27 +12,29 @@ _asciidoc()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
+    local noargopts='!(-*|*[abfdo]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --attribute | -!(-*)a)
+        --attribute | -${noargopts}a)
             return
             ;;
-        --backend | -!(-*)b)
+        --backend | -${noargopts}b)
             COMPREPLY=($(compgen -W 'docbook html4 xhtml11' -- "$cur"))
             return
             ;;
-        --conf-file | -!(-*)f)
+        --conf-file | -${noargopts}f)
             _filedir conf
             return
             ;;
-        --doctype | -!(-*)d)
+        --doctype | -${noargopts}d)
             _comp_xfunc_asciidoc_doctype
             return
             ;;
-        --help | -!(-*)h)
+        --help | -${noargopts}h)
             COMPREPLY=($(compgen -W 'manpage syntax topics' -- "$cur"))
             return
             ;;
-        --out-file | -!(-*)o)
+        --out-file | -${noargopts}o)
             _filedir
             return
             ;;

completions/autoscan

@@ -5,11 +5,13 @@ _autoscan()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
+    local noargopts='!(-*|*[BI]*)'
+    # shellcheck disable=SC2254
     case "$prev" in
-        --help | --version | -!(-*)[hV])
+        --help | --version | -${noargopts}[hV])
             return
             ;;
-        --prepend-include | --include | -!(-*)[BI])
+        --prepend-include | --include | -${noargopts}[BI])
             _filedir -d
             return
             ;;

completions/avahi-browse

@@ -5,11 +5,13 @@ _comp_cmd_avahi_browse()
     local cur prev words cword split comp_args
     _comp_initialize -s -- "$@" || return
 
+    local noargopts='!(-*|*[D]*)'
+    # shellcheck disable=SC2254
     case $prev in
-        --domain | -!(-*)D)
+        --domain | -${noargopts}D)
             return
             ;;
-        --help | --version | -!(-*)[hV]*)
+        --help | --version | -${noargopts}[hV]*)
             return
             ;;
     esac
@@ -27,7 +29,7 @@ _comp_cmd_avahi_browse()
     local word
     for word in "${words[@]}"; do
         case $word in
-            --all | --browse-domains | --dump-db | -!(-*)[aDb]*)
+            --all | --browse-domains | --dump-db | -${noargopts}[aDb]*)
                 return
                 ;;
         esac