[gentoo-commits] proj/gentoo-bashcomp:master commit in: /

["Jeremy Olexa" <darkside@gentoo.org>]

commit:     60fb879749f0e5d506f2ba4995d815b3d7f3392e
Author:     Jacek Sowiński <mruwek.gentoo <AT> vcf <DOT> pl>
AuthorDate: Sat Apr 21 17:47:00 2012 +0000
Commit:     Jeremy Olexa <darkside <AT> gentoo <DOT> org>
CommitDate: Tue Apr 24 16:09:09 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bashcomp.git;a=commit;h=60fb8797

Fix completion for `equery belongs`

    1. Remove -c and --category options as they are not present in
       `equery belongs --help` output.
    2. Make code indentation more readable.
    3. "Only complete if the previous entry on the command line is not
       a file name." now works properly also with options.

--HG--
extra : source : 9f755f92ba552dcd20d20e473ff6cf5848c27e9e

---
 gentoo |   36 +++++++++++-------------------------
 1 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/gentoo b/gentoo
index 2ae86f9..e93fd78 100644
--- a/gentoo
+++ b/gentoo
@@ -1177,31 +1177,17 @@ _equery()
     b?(elongs))
         # Only complete if the previous entry on the command line is not
         # a file name.
-        if \
-            [[ \
-            ${prev} == ${mode} || \
-            ${prev:0:1} == "-" || \
-            ${COMP_WORDS[COMP_CWORD-2]} == "-c" || \
-            ${COMP_WORDS[COMP_CWORD-2]} == "--category" \
-        ]] && \
-        [[ \
-            ${prev} != "-c" && \
-            ${prev} != "--category" \
-        ]]
-        then
-        case $cur in
-            -*)
-                COMPREPLY=($(compgen -W "-h --help -f --full-regex -e
-                    --early-out -n --name-only" -- $cur))
-                ;;
-            *)
-                COMPREPLY=($(compgen -f -- $cur) \
-                    $(compgen -d -S '/' -- $cur))
-                ;;
-        esac
-        # Are we completing a category?
-        elif [[ ${prev} == "-c" || ${prev} == "--category" ]]; then
-        COMPREPLY=($(builtin cd ${portdir}/metadata/cache; compgen -W "$(compgen -G '*')" -- $cur))
+        if [[ ${prev} == ${mode} || ${prev:0:1} == "-" ]]; then
+            case $cur in
+                -*)
+                    COMPREPLY=($(compgen -W "-h --help -f --full-regex -e
+                        --early-out -n --name-only" -- $cur))
+                    ;;
+                *)
+                    COMPREPLY=($(compgen -f -- $cur) \
+                        $(compgen -d -S '/' -- $cur))
+                    ;;
+            esac
         fi
         ;;
     u?(ses))