diff options
Diffstat (limited to 'keyringer')
| -rwxr-xr-x | keyringer | 30 |
1 files changed, 26 insertions, 4 deletions
@@ -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 @@ -129,17 +133,35 @@ function keyringer_preferences { # Config NAME="keyringer" +KEYRINGER_VERSION="0.1" CONFIG="$HOME/.$NAME/config" BASENAME="`basename $0`" KEYRING="$1" ACTION="$2" -ACTIONS="`dirname $(readlink -f $0)`/share/$NAME" -# Export preferences for other scripts +# Export preferences and version for other scripts export PREFERENCES="`dirname $CONFIG`/$KEYRING" +export KEYRINGER_VERSION + +# Set functions location +if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/functions" ]; then + # Development or local installation layout + LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions" +else + # System installation layout + LIB="`dirname $(readlink -f $0)`/../lib/$NAME/functions" +fi + +# Set actions location +if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then + # Development or local installation layout + ACTIONS="`dirname $(readlink -f $0)`/share/$NAME" +else + # System installation layout + ACTIONS="`dirname $(readlink -f $0)`/../share/$NAME" +fi # Load functions -LIB="`dirname $(readlink -f $0)`/lib/$NAME/functions" source "$LIB" || exit 1 # Setup main configuration and load preferences |