From d26ede488cbb64bc2faec50976f2cc1b313a88aa Mon Sep 17 00:00:00 2001
From: Igor Murzov <e-mail@date.by>
Date: Sun, 20 Nov 2011 20:45:08 +0300
Subject: [PATCH] valgrind: More generic tools detection.

Libdir is still hardcoded though.
---
 completions/valgrind | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/completions/valgrind b/completions/valgrind
index 446f0962..d1834526 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)