Shell completions: use KEYRINGER_CHECK_RECIPIENTS=false to avoid fatal errors

diff --git a/ChangeLog b/ChangeLog
index e74103027b562b21aa8dbf379b1170d24d581d8e..9a2475ab3422bfaf6bd22ed0a231072632def226 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
 2014-08-21 - Silvio Rhatto <rhatto@riseup.net>
 
+       Shell completions: use KEYRINGER_CHECK_RECIPIENTS=false to avoid
+       fatal errors
+
+       Shell completions: minor zsh fixes
+
        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/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index b638418b6039048800070c6899259ebea9b4247e..27cf919c3b3974b5a96747ed6c86c6346455ec80 100644 (file)
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -82,7 +82,7 @@ _keyringer() {
   if [ "${#COMP_WORDS[@]}" == "2" ]; then
     opts="$keyrings"
   elif [ "${#COMP_WORDS[@]}" == "3" ] && echo "${prev}" | grep -qe "$instances"; then
-    opts="`export KEYRINGER_CHECK_VERSION=false && keyringer $instance commands`"
+    opts="`export KEYRINGER_CHECK_RECIPIENTS=false && export KEYRINGER_CHECK_VERSION=false && keyringer $instance commands`"
   elif [ "${#COMP_WORDS[@]}" == "3" ]; then
     opts="init"
   elif [ "${#COMP_WORDS[@]}" == "4" ]; then
@@ -95,7 +95,7 @@ _keyringer() {
         ;;
       ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find)
         cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
-        opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
+        opts="$(bash -c "set -f && export KEYRINGER_CHECK_RECIPIENTS=false && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       genpair)
         opts="gpg ssh ssl ssl-self"
@@ -118,7 +118,7 @@ _keyringer() {
         ;;
       genpair)
         cur="`echo ${cur} | sed -e "s|^/*||"`" # avoid leading slash
-        opts="$(bash -c "set -f && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
+        opts="$(bash -c "set -f && export KEYRINGER_CHECK_RECIPIENTS=false && export KEYRINGER_CHECK_VERSION=false && keyringer $instance ls -p -d ${cur}*" 2> /dev/null)"
         ;;
       git)
         # TODO

diff --git a/lib/keyringer/completions/zsh/_keyringer b/lib/keyringer/completions/zsh/_keyringer
index bd08a8c5673934108129ea9fc711e32db1dab7d8..ab95c3d4c7e9714f723d4effe4d269bc4a878400 100644 (file)
--- a/lib/keyringer/completions/zsh/_keyringer
+++ b/lib/keyringer/completions/zsh/_keyringer
@@ -36,7 +36,7 @@ _keyringer() {
         ;;
       action)
         if echo $words[2] | grep -qe "$instances"; then
-          compadd "$@" `KEYRINGER_CHECK_VERSION=false keyringer $words[2] commands`
+          compadd "$@" `KEYRINGER_CHECK_RECIPIENTS=false KEYRINGER_CHECK_VERSION=false keyringer $words[2] commands`
         else
           compadd "$@" "init"
         fi
@@ -51,7 +51,7 @@ _keyringer() {
             ;;
           ls|tree|mkdir|encrypt|encrypt-batch|decrypt|edit|append|append-batch|del|rm|recrypt|open|clip|xclip|find)
             words[4]="`echo $words[4] | sed -e "s|^/*||"`" # avoid leading slash
-            compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
+            compadd "$@" $(KEYRINGER_CHECK_RECIPIENTS=false KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[4]'*' 2> /dev/null)
             ;;
           genpair)
             compadd "$@" gpg ssh ssl ssl-self
@@ -74,7 +74,7 @@ _keyringer() {
             ;;
           genpair)
             words[5]="$(echo $words[5] | sed -e "s|^/||")" # TODO: avoid leading slash
-            compadd "$@" $(KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]'*' 2> /dev/null)
+            compadd "$@" $(KEYRINGER_CHECK_RECIPIENTS=false KEYRINGER_CHECK_VERSION=false keyringer $words[2] ls -p -d $words[5]'*' 2> /dev/null)
             ;;
           git)
             compadd "$@" $(_keyringer_git_complete $words[4] $words[5])