[Bash-completion-commits] [SCM] bash-completion branch, master, updated. cb6a9a4dfedf7f9a45ae9f6c010b73aae2d33323

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 4cd7c7c87254e8fd39ee4c7fcb423ea3d26c7db5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Thu Oct 7 20:05:55 2010 +0300

    Treat *.spm as *.src.rpm.
    
    Source rpms are sometimes named *.spm, e.g. in SUSE.

diff --git a/bash_completion b/bash_completion
index 1ba2d07..af10c39 100644
--- a/bash_completion
+++ b/bash_completion
@@ -102,7 +102,7 @@ complete -f -X '!*.fig' xfig
 complete -f -X '!*.@(mid?(i)|cmf)' playmidi
 complete -f -X '!*.@(mid?(i)|rmi|rcp|[gr]36|g18|mod|xm|it|x3m|s[3t]m|kar)' timidity
 complete -f -X '!*.@(m[eo]d|s[3t]m|xm|it)' modplugplay modplug123
-complete -f -X '*.@(o|so|so.!(conf)|a|rpm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
+complete -f -X '*.@(o|so|so.!(conf)|a|[rs]pm|gif|jp?(e)g|mp3|mp?(e)g|avi|asf|ogg|class)' vi vim gvim rvim view rview rgvim rgview gview emacs xemacs sxemacs kate kwrite
 complete -f -X '!*.@([eE][xX][eE]?(.[sS][oO])|[cC][oO][mM]|[sS][cC][rR])' wine
 complete -f -X '!*.@(zip|z|gz|tgz)' bzme
 # konqueror not here on purpose, it's more than a web/html browser
@@ -113,7 +113,7 @@ complete -f -X '!*.@(sxc|stc|xls?([bmx])|xlw|xlt?([mx])|[ct]sv|ods|ots)' oocalc
 complete -f -X '!*.@(sxd|std|sda|sdd|odg|otg)' oodraw
 complete -f -X '!*.@(sxm|smf|mml|odf)' oomath
 complete -f -X '!*.odb' oobase
-complete -f -X '!*.rpm' rpm2cpio
+complete -f -X '!*.[rs]pm' rpm2cpio
 complete -f -X '!*.aux' bibtex
 complete -f -X '!*.po' poedit gtranslator kbabel lokalize
 complete -f -X '!*.@([Pp][Rr][Gg]|[Cc][Ll][Pp])' harbour gharbour hbpp
diff --git a/completions/_mock b/completions/_mock
index f16f116..40e422c 100644
--- a/completions/_mock
+++ b/completions/_mock
@@ -72,7 +72,7 @@ _mock()
             --sources --verbose --quiet --trace --enable-plugin \
             --disable-plugin --print-root-path' -- "$cur" ) )
     else
-        _filedir '?(no)src.rpm'
+        _filedir '@(?(no)src.r|s)pm'
     fi
 } &&
 complete -F _mock -o filenames mock
diff --git a/completions/rpm b/completions/rpm
index d268cab..16870da 100644
--- a/completions/rpm
+++ b/completions/rpm
@@ -164,7 +164,7 @@ _rpm()
                 --excludepath --ignoresize --oldpackage \
                 --queryformat --repackage --nosuggests" -- "$cur" ) )
             else
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             fi
             ;;
         -e|--erase)
@@ -201,7 +201,7 @@ _rpm()
                     COMPREPLY=( $( compgen -W "$opts --ftpport --ftpproxy \
                         --httpport --httpproxy --nomanifest" -- "$cur" ) )
                 else
-                    _filedir 'rpm'
+                    _filedir '[rs]pm'
                 fi
             else
                 # -q; installed package completion
@@ -221,7 +221,7 @@ _rpm()
                 COMPREPLY=( $( compgen -W "$opts --nopgp --nogpg --nomd5" \
                     -- "$cur" ) )
             else
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             fi
             ;;
         -[Vy]*|--verify)
@@ -236,7 +236,7 @@ _rpm()
             elif [[ $COMP_LINE == *\ -@(*([^ -])g|-group )* ]]; then
                 _rpm_groups
             elif [[ $COMP_LINE == *\ -@(*([^ -])p|-package )* ]]; then
-                _filedir 'rpm'
+                _filedir '[rs]pm'
             else
                 _rpm_installed_packages "$nodig" "$nosig"
             fi
@@ -257,14 +257,14 @@ _rpm()
                 COMPREPLY=( $( compgen -W "$opts --nodeps --rmsource \
                   --rmspec --sign --nodirtokens --target" -- "$cur" ) )
             else
-                _filedir '?(no)src.rpm'
+                _filedir '@(?(no)src.r|s)pm'
             fi
             ;;
         --tarbuild)
             _filedir '@(t?(ar.)@([gx]z|bz?(2))|tar.@(lzma|Z))'
             ;;
         --resign|--addsign)
-            _filedir 'rpm'
+            _filedir '[rs]pm'
             ;;
         --setperms|--setgids)
             _rpm_installed_packages "$nodig" "$nosig"

-- 
bash-completion