[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.90-57-g8116663

[Igor Murzov]

The following commit has been merged in the master branch:
commit d26ede488cbb64bc2faec50976f2cc1b313a88aa
Author: Igor Murzov <e-mail at date.by>
Date:   Sun Nov 20 20:45:08 2011 +0300

    valgrind: More generic tools detection.
    
    Libdir is still hardcoded though.

diff --git a/completions/valgrind b/completions/valgrind
index 446f096..d183452 100644
--- a/completions/valgrind
+++ b/completions/valgrind
@@ -30,13 +30,11 @@ _valgrind()
             ;;
         --tool)
             # Tools seem to be named e.g. like memcheck-amd64-linux from which
-            # we want to grab memcheck; the same dir may contain things like
-            # default.supp, vgpreload_*.so etc which we want to skip.
-            # TODO: probably needs adjustment to be more generic
-            COMPREPLY=( $( compgen -W "$( \
-                command ls -1 /usr{,/local}/lib{,64}/valgrind 2>/dev/null | \
-                sed -e '/\.so$/d' -ne 's/^\(.*\)-\([^-]*\)-\([^-]*\)/\1/p' )" \
-                -- "$cur" ) )
+            # we want to grab memcheck.
+            COMPREPLY=( $( for f in /usr{,/local}/lib{,64}/valgrind/*; do
+                [[ $f != *.so && -x $f ]] &&
+                    sed -ne "s/^.*\/\($cur.*\)-\([^-]*\)-\([^-]*\)/\1/p" <<<$f
+                done) )
             return
             ;;
         --sim-hints)

-- 
bash-completion