rpms/bash-completion/devel bash-completion-mock, 1.2, 1.3 bash-completion.spec, 1.22, 1.23

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12450

Modified Files:
	bash-completion-mock bash-completion.spec 
Log Message:
Update mock completion


Index: bash-completion-mock
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion-mock,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion-mock	30 Aug 2006 21:27:32 -0000	1.2
+++ bash-completion-mock	16 Nov 2007 22:07:07 -0000	1.3
@@ -2,41 +2,62 @@
 
 _mock()
 {
-    local cur prev commands cfgdir
+    local cur prev commands plugins cfgdir
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
     prev=${COMP_WORDS[COMP_CWORD-1]}
-    commands='rebuild chroot init clean shell'
+    commands='rebuild chroot init clean shell installdeps install'
+    plugins='ccache yum_cache root_cache bind_mount'
     cfgdir=/etc/mock
 
     count=0
     for i in ${COMP_WORDS[@]} ; do
         [ $count -eq $COMP_CWORD ] && break
-        [ "$i" == --configdir ] && cfgdir="${COMP_WORDS[((count+1))]}"
+        if [[ "$i" == --configdir ]] ; then
+            cfgdir="${COMP_WORDS[((count+1))]}"
+        elif [[ "$i" == --configdir=* ]] ; then
+            cfgdir=${i/*=/}
+        fi
         count=$((++count))
     done
 
     case $prev in
-        --@(config|result|state)dir)
-            _filedir -d
-            return 0
-            ;;
         -r)
             COMPREPLY=( $( command ls $cfgdir | \
                 sed -ne 's/^\('$cur'.*\)\.cfg$/\1/p') )
             return 0
             ;;
-        -@(-arch|-uniqueext|-help|h))
+        -@(-help|h))
             return 0
             ;;
     esac
 
+    # --name=value style option
+    if [[ "$cur" == *=* ]] ; then
+        prev=${cur/=*/}
+        cur=${cur/*=/}
+        case $prev in 
+            --@(config|result)dir)
+                _filedir -d
+                return 0
+                ;;
+            --@(en|dis)able-plugin)
+                COMPREPLY=( $( compgen -W "$plugins" -- $cur ) )
+                return 0
+                ;;
+            -@(-arch|-uniqueext|-rpmbuild_timeout))
+                return 0
+                ;;
+        esac
+    fi
+
     # TODO: process $commands
     if [[ "$cur" == -* ]] ; then
-        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean --arch \
-            --debug --resultdir --statedir --uniqueext --configdir --quiet \
-            --autocache --rebuildcache' -- $cur ) )
+        COMPREPLY=( $( compgen -W '--version -h --help -r --no-clean \
+            --cleanup-after --no-cleanup-after --arch= --resultdir= \
+            --uniqueext= --configdir= --rpmbuild_timeout= --enable-plugin= \
+            --disable-plugin=' -- $cur ) )
     else
         _filedir '?(no)src.rpm'
     fi


Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- bash-completion.spec	16 Nov 2007 21:34:15 -0000	1.22
+++ bash-completion.spec	16 Nov 2007 22:07:07 -0000	1.23
@@ -188,6 +188,7 @@
 %changelog
 * Fri Nov 16 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-7
 - Add JPEG2000 extensions for display(1) (#304771).
+- Update mock completion.
 
 * Sat Sep 22 2007 Ville Skyttä <ville.skytta at iki.fi> - 20060301-6
 - Patch to improve perl completion (#299571, Jim Radford,