From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 14 Nov 2013 13:15:32 +0000 (-0200)
Subject: Edit default recipients during initialization
X-Git-Tag: 0.2.7~10
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=8857d60617c00553aaab7f06153b17699c860e96;p=keyringer.git

Edit default recipients during initialization
---

diff --git a/keyringer b/keyringer
index 8ba1093..7aad6a0 100755
--- a/keyringer
+++ b/keyringer
@@ -90,8 +90,16 @@ function keyringer_init {
   # Init
   if ! keyringer_is_git "$BASEDIR"; then
     keyringer_exec git "$BASEDIR" init
+
+    # Edit default recipients
+    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
+
+    # Stage and commit
     keyringer_exec git "$BASEDIR" add .
-    keyringer_exec git "$BASEDIR" commit -m Importing
+    keyringer_exec git "$BASEDIR" commit -m Initializing
   fi
 }
 
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index d1bbb1c..b39b8ec 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -517,7 +517,7 @@ function keyringer_set_new_recipients {
 function keyringer_create_new_recipients {
   if [ ! -e "$1" ]; then
     mkdir -p "`dirname $1`"
-    echo "# Use entries in the form of 'john@doe.com XXXXXXXX'" > "$1"
+    echo "# Use entries in the form of 'john@doe.com XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'" > "$1"
     echo "" >> "$1"
   fi
 }