aboutsummaryrefslogtreecommitdiff
path: root/keyringer
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-08-21 15:04:52 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-08-21 15:04:52 -0300
commitbfd718703aac6fe706ee751f232b0e80601913d1 (patch)
treeb7541fdd334d1a02e3405654a11d9ec61f0ee129 /keyringer
parentdf97a807e2c13a5d020d72f07058904b60f19cfd (diff)
downloadkeyringer-bfd718703aac6fe706ee751f232b0e80601913d1.tar.gz
keyringer-bfd718703aac6fe706ee751f232b0e80601913d1.tar.bz2
Moving editors' files to shared folder
Diffstat (limited to 'keyringer')
-rwxr-xr-xkeyringer24
1 files changed, 17 insertions, 7 deletions
diff --git a/keyringer b/keyringer
index b8edc8e..a32f15b 100755
--- a/keyringer
+++ b/keyringer
@@ -149,13 +149,6 @@ ACTION="$2"
# Turn off pathname expansion so expansion can work properly
set -f
-# Export globals for other scripts
-export PREFERENCES="`dirname $CONFIG`/$KEYRING"
-export KEYRINGER_VERSION
-export CONFIG_VERSION
-export KEYRING
-export CONFIG
-
# Set functions location
if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/functions" ]; then
# Development or local installation layout
@@ -165,6 +158,15 @@ else
LIB="`dirname $(readlink -f $0)`/../lib/$NAME/functions"
fi
+# Set shared files location
+if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then
+ # Development or local installation layout
+ SHARE="`dirname $(readlink -f $0)`/share/$NAME"
+else
+ # System installation layout
+ SHARE="`dirname $(readlink -f $0)`/../share/$NAME"
+fi
+
# Set actions location
if [ -e "`dirname $(readlink -f $0)`/lib/$NAME/actions" ]; then
# Development or local installation layout
@@ -174,6 +176,14 @@ else
ACTIONS="`dirname $(readlink -f $0)`/../lib/$NAME/actions"
fi
+# Export globals for other scripts
+export PREFERENCES="`dirname $CONFIG`/$KEYRING"
+export KEYRINGER_VERSION
+export CONFIG_VERSION
+export KEYRING
+export CONFIG
+export SHARE
+
# Load functions
source "$LIB" || exit 1