From: Silvio Rhatto <rhatto@riseup.net>
Date: Wed, 11 Dec 2013 00:32:59 +0000 (-0200)
Subject: Fix instance list at shell completions
X-Git-Tag: 0.3~19
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=7aac0eea6ab0690e040ffe2ed2eab4adde8d5ead;p=keyringer.git

Fix instance list at shell completions
---

diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index 5474c67..eb8fabd 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -70,10 +70,10 @@ _keyringer() {
 
   # Process config
   source $config/config
-  keyrings="`ls --color=never $config | sed -e 's/config//' | xargs`"
+  keyrings="`ls --color=never $config | sed -e '/^config$/d' | xargs`"
 
   # Available instances
-  instances="`echo $keyrings | sed -e 's/ /\\\|/g'`"
+  instances="`echo $keyrings | sed -e 's/ /$\\\|^/g' -e 's/^/^/' -e 's/$/$/'`"
 
   # The current instance
   instance="${COMP_WORDS[1]}"
diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index 0eba079..e889fd8 100644
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -20,9 +20,9 @@ _keyringer() {
 
     # Process config
     source $config/config
-    local keyrings="`ls --color=never $config | sed -e 's/config//' | xargs`"
+    local keyrings="`ls --color=never $config | sed -e '/^config$/d' | xargs`"
     local keyring_path="`eval echo '$'$words[2]`"
-    local instances="`echo $keyrings | sed -e 's/ /\\\|/g'`"
+    local instances="`echo $keyrings | sed -e 's/ /$\\\|^/g' -e 's/^/^/' -e 's/$/$/'`"
 
     _arguments        \
       '1: :->keyring' \