mysql: Fix --default-character-set completion with mariadb

scop · Feb 25, 2016 · 695b28a · 695b28a
1 parent f8b0828
commit 695b28a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/completions/mysql b/completions/mysql
@@ -20,8 +20,10 @@ _mysql()
             return 0
             ;;
         --default-character-set)
-            [[ -d /usr/share/mysql/charsets ]] && \
-                COMPREPLY=( $( compgen -W "$(command ls /usr/share/mysql/charsets | command sed -e '/^README$/d' -e '/^Index\.xml$/d' -e 's/.xml$//') utf8" -- "$cur" ) )
+            local charsets=( $( command ls /usr/share/m{ariadb,ysql}/charsets/*.xml 2>/dev/null ) )
+            charsets=( ${charsets[@]##*/} )
+            charsets=( ${charsets[@]%%?(Index).xml} utf8 )
+            COMPREPLY=( $( compgen -W '${charsets[@]}' -- "$cur" ) )
             return 0
             ;;
 

diff --git a/test/lib/completions/mysql.exp b/test/lib/completions/mysql.exp
@@ -12,8 +12,10 @@ setup
 
 
 assert_complete_any "mysql --"
+sync_after_int
 
 
+assert_complete_any "mysql --default-character-set="
 sync_after_int