[yum-commits] Branch 'yum-3_2_X' - 3 commits - etc/yum.bash

[Ville Skyttä]

 etc/yum.bash |   20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

New commits:
commit ff22bfea8a964e90fcaf0d5e0e4f68959082441e
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Sep 13 22:02:02 2010 +0300

    Add 'history package-list' + aliases completion.

diff --git a/etc/yum.bash b/etc/yum.bash
index a55b8a2..8ca00fd 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -84,13 +84,13 @@ _yum()
         localinstall localupdate makecache provides reinstall remove repolist
         resolvedep search shell update upgrade version distro-sync )
 
-    local i c cmd
-    for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+    local i c cmd subcmd
+    for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )) ; do
+        [[ -n $cmd ]] && subcmd=${COMP_WORDS[i]} && break
         for c in ${cmds[@]} check-rpmdb erase groupupdate grouperase \
             whatprovides distribution-synchronization ; do
             [ ${COMP_WORDS[i]} = $c ] && cmd=$c && break
         done
-        [ -z $cmd ] || break
     done
 
     case $cmd in
@@ -153,7 +153,7 @@ _yum()
             case $prev in
                 history)
                     COMPREPLY=( $( compgen -W 'info list summary undo redo
-                        new addon-info' -- "$cur" ) )
+                        new addon-info package-list' -- "$cur" ) )
                     ;;
                 undo|redo|addon|addon-info)
                     COMPREPLY=( $( compgen -W "last $( $yum -d 0 -C history \
@@ -162,6 +162,12 @@ _yum()
                         -- "$cur" ) )
                     ;;
             esac
+            case $subcmd in
+                package-list|pkg|pkgs|pkg-list|pkgs-list|package|packages|\
+                packages-list)
+                    _yum_list installed "$cur"
+                    ;;
+            esac
             return 0
             ;;
 
commit d21f1c2377da037744bf27b3e57076069daadbd4
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Sep 13 21:54:55 2010 +0300

    Add 'history addon' completion.

diff --git a/etc/yum.bash b/etc/yum.bash
index 63459bf..a55b8a2 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -155,7 +155,7 @@ _yum()
                     COMPREPLY=( $( compgen -W 'info list summary undo redo
                         new addon-info' -- "$cur" ) )
                     ;;
-                undo|redo|addon-info)
+                undo|redo|addon|addon-info)
                     COMPREPLY=( $( compgen -W "last $( $yum -d 0 -C history \
                         2>/dev/null | \
                         sed -ne 's/^[[:space:]]*\([0-9]\{1,\}\).*/\1/p' )" \
commit 3227460af777565fcdeccd520200ad63a942b816
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Sep 13 21:53:40 2010 +0300

    Wrap long lines.

diff --git a/etc/yum.bash b/etc/yum.bash
index 057a9ac..63459bf 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -81,8 +81,8 @@ _yum()
     local prev=$3
     local cmds=( check check-update clean deplist downgrade groupinfo
         groupinstall grouplist groupremove help history info install list
-        localinstall localupdate makecache provides reinstall remove repolist resolvedep
-        search shell update upgrade version distro-sync )
+        localinstall localupdate makecache provides reinstall remove repolist
+        resolvedep search shell update upgrade version distro-sync )
 
     local i c cmd
     for (( i=0; i < ${#COMP_WORDS[@]}-1; i++ )) ; do