From bd482898d4e39905234720178fa47c547b498b39 Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Sat, 9 Jan 2016 18:55:42 +0100 Subject: [PATCH] Simplify and stringify valgrind completions These used _eval_ when a simple variable capturing would have sufficed. --- share/completions/valgrind.fish | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/share/completions/valgrind.fish b/share/completions/valgrind.fish index 2d87bbc48..9dfe968c1 100644 --- a/share/completions/valgrind.fish +++ b/share/completions/valgrind.fish @@ -1,7 +1,7 @@ # Don't go invoking valgrind unless it is installed set -l skin tool -if begin ; type valgrind >/dev/null ; and valgrind --version ^/dev/null | __fish_sgrep -- '-2\.[012]\.' >/dev/null ^/dev/null ; end +if type -q valgrind; and valgrind --version ^/dev/null | string match -qr -- '-2\.[012]\.' # In older versions of Valgrind, the skin selection option was # '--skin' # But someone decided that it would be fun to change this to @@ -17,16 +17,16 @@ complete -xc valgrind -l $skin --description "Skin" -a " massif\tHeap\ profiler " -eval " -function __fish_valgrind_skin --argument tool +function __fish_valgrind_skin --argument tool -V skin set -l cmd (commandline -cpo) - if contains -- --$skin=\$tool \$cmd + # Quote $cmd so the tokens are separated with a space + if string match -qr -- "--$skin(=| )$tool" "$cmd" return 0 end - test \$tool = memcheck - and echo \$cmd | grep -qve $skin + # memcheck is the default tool/skin + test $tool = memcheck + and not string match -- $skin $cmd end -" complete -c valgrind -l help --description "Display help and exit" complete -c valgrind -l help-debug --description "Display help and debug options"