[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-235-g26ae770

[Sergey V]

The following commit has been merged in the master branch:
commit d77fb12d0117449bc3edda213ec388ca2911a8f2
Author: Sergey V <sftp.mtuci at gmail.com>
Date:   Sat Jan 8 02:27:40 2011 +0300

    sbopkg: improve code, make it more logical
    
    - remove ugly case '-c|-g|-h|-k|-l|-o|-P|-p|-q|-R|-r|-s|-u|-v)'
    - remove second case statement
    
    Reviewed-by: Igor Murzov <igor at gplsoft.org>

diff --git a/completions/sbopkg b/completions/sbopkg
index 1bc71bb..873cb74 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -1,3 +1,4 @@
+# -*- sh -*-
 # bash completion for sbopkg tool
 #
 # (c) Igor Murzov <igor at gplsoft.org>
@@ -29,9 +30,14 @@ _sbopkg()
             _filedir -d
             return 0
             ;;
-        -c|-g|-h|-k|-l|-o|-P|-p|-q|-R|-r|-s|-u|-v)
-            # argument required but no completions available
-            # or argument not required
+        -V)
+            COMPREPLY=( $( compgen -W "? \
+                `sbopkg -V ? 2>&1 | cut -s -f1`" -- "$cur" ) )
+            return 0
+            ;;
+        -i|-b)
+            ;;
+        *)
             return 0
             ;;
     esac
@@ -65,21 +71,12 @@ _sbopkg()
         esac
     done
 
-    case $prev in
-        -V)
-            COMPREPLY=( $( compgen -W "? \
-                `sbopkg -V ? 2>&1 | cut -s -f1`" -- "$cur" ) )
-            return 0
-            ;;
-        -i|-b)
-            if [ ! -r "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT" ]; then
-                return 0
-            fi
-            COMPREPLY=( $( grep "^SLACKBUILD NAME: $cur" \
-                    $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT | cut -f3- -d\  ) 
-                $( (cd $QUEUEDIR; ls $cur*.sqf 2> /dev/null) ) )
-            return 0
-            ;;
-    esac
+    if [ ! -r "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT" ]; then
+        return 0
+    fi
+    COMPREPLY=( $( grep "^SLACKBUILD NAME: $cur" \
+        $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT | cut -f3- -d\  )
+        $( (cd $QUEUEDIR; ls $cur*.sqf 2> /dev/null) ) )
+    return 0
 
 } && complete -F _sbopkg sbopkg -o plusdirs

-- 
bash-completion