summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-11-14 11:15:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-11-14 11:15:32 -0200
commit8857d60617c00553aaab7f06153b17699c860e96 (patch)
tree731a6c43b057d444932ff51e930a9d643bf55ecb
parent8b05cfce978dbed626f0e3b100c64d36d52550a4 (diff)
downloadkeyringer-8857d60617c00553aaab7f06153b17699c860e96.tar.gz
keyringer-8857d60617c00553aaab7f06153b17699c860e96.tar.bz2
Edit default recipients during initialization
-rwxr-xr-xkeyringer10
-rwxr-xr-xlib/keyringer/functions2
2 files changed, 10 insertions, 2 deletions
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
}