[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-418-g1de06f5

[Ville Skyttä]

The following commit has been merged in the master branch:
commit 1de06f5de64c6fef579a3f2ca5089f0ed2943a92
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Tue Aug 16 00:27:23 2011 +0300

    _ImageMagick: Drop unnecessary tr invocations.

diff --git a/completions/imagemagick b/completions/imagemagick
index df605de..160d7c2 100644
--- a/completions/imagemagick
+++ b/completions/imagemagick
@@ -52,9 +52,9 @@ _ImageMagick()
             return 0
             ;;
         -format)
-            COMPREPLY=( $( compgen -W "$( convert -list format | \
-                awk '/ [r-][w-][+-] / {print $1}' | \
-                tr -d '*' | tr [:upper:] [:lower:] )" -- "$cur" ) )
+            COMPREPLY=( $( compgen -W "$( convert -list format | awk \
+                '/ [r-][w-][+-] / { sub("[*]$","",$1); print tolower($1) }' )" \
+                -- "$cur" ) )
             return 0
             ;;
         -gravity)
diff --git a/test/lib/completions/convert.exp b/test/lib/completions/convert.exp
index 0703204..b3a2e56 100644
--- a/test/lib/completions/convert.exp
+++ b/test/lib/completions/convert.exp
@@ -12,8 +12,10 @@ setup
 
 
 assert_complete_any "convert "
+sync_after_int
 
 
+assert_complete_any "convert -format "
 sync_after_int
 
 

-- 
bash-completion