summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-14 10:33:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-14 10:33:33 -0300
commit301b02acc4d165548d8209dd5b5e2f214dcde765 (patch)
treee7c5dfdba13626a982d6764f59dbd7f739fadbe8
parentdee97a0629659ed8e2c8a716611e88a9bb7f068d (diff)
downloadkeyringer-301b02acc4d165548d8209dd5b5e2f214dcde765.tar.gz
keyringer-301b02acc4d165548d8209dd5b5e2f214dcde765.tar.bz2
Always use keyringer_exec / init action check
-rwxr-xr-xkeyringer4
1 files changed, 2 insertions, 2 deletions
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