From b75c11d9a846f39c9de6c8c825a3e77cbe4de12c Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 28 Sep 2013 17:18:21 -0300 Subject: Do not rely on bash at zsh completion --- lib/keyringer/completions/zsh/_keyringer | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/keyringer/completions') diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer index 0a158eb..3a10347 100644 --- 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]) ;; *) -- cgit v1.2.3