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

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 29baa6b72050cc7ed81abe700909c1a1fbe44f69
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Nov 23 17:32:48 2009 +0200

    Fix modprobe -r completion when a path to modprobe is specified.

diff --git a/CHANGES b/CHANGES
index 4d5666b..b4c8cb4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -23,8 +23,8 @@ bash-completion (2.x)
   * Apply cardctl completion to pccardctl too.
   * Apply pine completion to alpine too.
   * Remove many unnecessary short option completions where long ones exist.
-  * Improve configure, cvs, gkrellm, lftp, mdadm, mplayer, mysqladmin, service,
-    and ssh completions.
+  * Improve configure, cvs, gkrellm, lftp, mdadm, modprobe, mplayer,
+    mysqladmin, service, and ssh completions.
   * Add abook and wtf completion, based on work by Raphaël Droz.
   * Add k3b and lftpget completion.
   * Don't overwrite other host completions when completing from multiple
diff --git a/bash_completion b/bash_completion
index fb57699..4e48c98 100644
--- a/bash_completion
+++ b/bash_completion
@@ -1000,7 +1000,7 @@ _insmod()
     prev=${COMP_WORDS[COMP_CWORD-1]}
 
     # behave like lsmod for modprobe -r
-    if [ $1 = "modprobe" ] &&
+    if [ ${1##*/} = "modprobe" ] &&
         [ "${COMP_WORDS[1]}" = "-r" ]; then
         _installed_modules "$cur"
         return 0

-- 
bash-completion