Minor zsh completion fixes

diff --git a/ChangeLog b/ChangeLog
index 0905d9fe751eafd9459a174ef32382a24a3422f9..e74103027b562b21aa8dbf379b1170d24d581d8e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2014-08-21 - Silvio Rhatto <rhatto@riseup.net>
 
        Shell completions: fix handling of keyrings with '-' in their names
+       and minor zsh fixes.
 
        Edit: Unset RELATIVE_PATH before encrypting file
 

diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index 6142949e53057f040e1b8ef14771dbf5ac3e8287..bd08a8c5673934108129ea9fc711e32db1dab7d8 100644 (file)
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -70,7 +70,7 @@ _keyringer() {
         case "$words[3]" in
           recipients)
             words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid leading slash
-            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)
             words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid leading slash
@@ -87,7 +87,7 @@ _keyringer() {
         esac
         ;;
       *)
-        if [ $words[3] == "git" ]; then
+        if [[ $words[3] == "git" ]]; then
           # TODO
           true
         fi