From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 14 Mar 2014 13:33:33 +0000 (-0300)
Subject: Always use keyringer_exec / init action check
X-Git-Tag: 0.3.1~6
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=301b02acc4d165548d8209dd5b5e2f214dcde765;p=keyringer.git

Always use keyringer_exec / init action check
---

diff --git a/keyringer b/keyringer
index e57dfd0..da87678 100755
--- a/keyringer
+++ b/keyringer
@@ -97,7 +97,7 @@ function keyringer_init {
     echo "Now you have to edit the default recipient configuration to be able to encrypt secrets."
     echo "Press any key to proceed editing..."
     read key
-    keyringer $KEYRING recipients edit default
+    keyringer_exec recipients "$BASEDIR" edit default
 
     # Stage and commit
     keyringer_exec git "$BASEDIR" add .
@@ -162,7 +162,7 @@ fi
 source "$LIB" || exit 1
 
 # Check if keyring exist
-if [ ! -f "$CONFIG_BASE/$KEYRING" ]; then
+if [ ! -f "$CONFIG_BASE/$KEYRING" ] && [ "$ACTION" != "init" ]; then
   echo "No such keyring $KEYRING"
   exit 1
 fi