summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-09-28 17:18:21 -0300
committerSilvio Rhatto <rhatto@riseup.net>2013-09-28 17:18:21 -0300
commitb75c11d9a846f39c9de6c8c825a3e77cbe4de12c (patch)
tree553fe5902fd8c26dac9d90ef0236043e9c1b5a79
parent7b281024fdd9fd7bbf461265316360c80c4deee2 (diff)
downloadkeyringer-b75c11d9a846f39c9de6c8c825a3e77cbe4de12c.tar.gz
keyringer-b75c11d9a846f39c9de6c8c825a3e77cbe4de12c.tar.bz2
Do not rely on bash at zsh completion
-rw-r--r--lib/keyringer/completions/zsh/_keyringer9
1 files changed, 3 insertions, 6 deletions
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])
;;
*)