Do not rely on bash at zsh completion

diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index 0a158eb11e0a2838619d3d428eab5d55cbb96a04..3a1034722d48e22848a0219a27748a83ea3e0884 100644 (file)
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -46,8 +46,7 @@ _keyringer() {
             compadd "$@" ls edit
             ;;
           ls|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|recrypt|open)
-            # TODO: do not rely on bash
-            compadd "$@" $(bash -c "set -f && KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]*" 2> /dev/null)
+            compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
             ;;
           genpair)
             compadd "$@" gpg ssh ssl ssl-self
@@ -62,14 +61,12 @@ _keyringer() {
       misc)
         case "$words[3]" in
           recipients)
-            compadd "$@" $(cd $keyring_path/config/recipients && ls --color=never -p $words[5]* 2> /dev/null)
+            compadd "$@" $(cd $keyring_path/config/recipients && ls --color=never -p $words[5]'*' 2> /dev/null)
             ;;
           genpair)
-            # TODO: do not rely on bash
-            compadd "$@" $(bash -c "set -f && KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]*" 2> /dev/null)
+            compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]'*' 2> /dev/null)
             ;;
           git)
-            # TODO
             compadd "$@" $(_keyringer_git_complete $words[4] $words[5])
             ;;
           *)