Imported Upstream version 0.2.7upstream_keyringer_0.2.7

1 files changed, 13 insertions, 5 deletions

diff --git a/keyringer b/keyringer
index a4e8b2c..7aad6a0 100755
--- a/keyringer
+++ b/keyringer
@@ -68,7 +68,7 @@ function keyringer_init {
       touch "$OPTIONS"
 
       # Setup README
-      echo "Keyring repository powered by http://git.sarava.org/?p=keyringer.git;a=summary" > "$BASEDIR/README"
+      echo "Keyring repository powered by https://keyringer.pw" > "$BASEDIR/README"
       echo "" >> "$BASEDIR/README"
 
       # Set config version
@@ -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
 }
 
@@ -137,12 +145,12 @@ else
 fi
 
 # Set actions location
-if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then
+if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/actions" ]; then
   # Development or local installation layout
-  ACTIONS="`dirname $(readlink -f $0)`/share/$NAME"
+  ACTIONS="`dirname $(readlink -f $0)`/lib/$NAME/actions"
 else
   # System installation layout
-  ACTIONS="`dirname $(readlink -f $0)`/../share/$NAME"
+  ACTIONS="`dirname $(readlink -f $0)`/../lib/$NAME/actions"
 fi
 
 # Load functions