From d77fb12d0117449bc3edda213ec388ca2911a8f2 Mon Sep 17 00:00:00 2001 From: Sergey V Date: Sat, 8 Jan 2011 02:27:40 +0300 Subject: [PATCH] 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 --- completions/sbopkg | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/completions/sbopkg b/completions/sbopkg index 1bc71bbe..873cb74c 100644 --- a/completions/sbopkg +++ b/completions/sbopkg @@ -1,3 +1,4 @@ +# -*- sh -*- # bash completion for sbopkg tool # # (c) Igor Murzov @@ -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