summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2012-08-21 14:12:50 -0300
committerSilvio Rhatto <rhatto@riseup.net>2012-08-21 14:12:50 -0300
commitf348c88f07380747149265f319c3c3a97bd4a047 (patch)
tree871bbe748c770cb2e73b334cba0474d66ac9c6e2
parentf6f315aa3cbcaa33b2f69e79c83c08b841079703 (diff)
downloadkeyringer-f348c88f07380747149265f319c3c3a97bd4a047.tar.gz
keyringer-f348c88f07380747149265f319c3c3a97bd4a047.tar.bz2
Initialization fixes
-rwxr-xr-xkeyringer6
-rw-r--r--lib/keyringer/functions4
2 files changed, 9 insertions, 1 deletions
diff --git a/keyringer b/keyringer
index 7089a08..a59fd2f 100755
--- a/keyringer
+++ b/keyringer
@@ -24,6 +24,10 @@ function keyringer_init {
RECIPIENTS="$BASEDIR/config/recipients"
OPTIONS="$BASEDIR/config/options"
+ # We are initializing, so avoid some checks
+ export KEYRINGER_CHECK_VERSION="false"
+ export KEYRINGER_CHECK_RECIPIENTS="false"
+
# Parse
if [ -z "$BASEDIR" ]; then
echo "Usage: $BASENAME <keyring> init <path> [url]"
@@ -68,7 +72,7 @@ function keyringer_init {
fi
# Secure
- chmod 600 "$RECIPIENTS"
+ chmod 700 "$RECIPIENTS"
fi
# Reparse basedir to force absolute folder
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 6ac8bf8..dc1ce0f 100644
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -340,6 +340,10 @@ function keyringer_action_usage {
# Check recipients
function keyringer_check_recipients {
+ if [ "$KEYRINGER_CHECK_RECIPIENTS" == "false" ]; then
+ return
+ fi
+
# Check if recipients file is empty.
if [ "`grep -vE "^#|^$" "$RECIPIENTS"/* | wc -l`" == 0 ] && [ "$SUBCOMMAND" != "edit" ]; then
echo "Fatal: no recipients configured for this keyring."