Ensure manually configured folder in env-vars is used (#11)

Ensure manually configured folder in env-vars is used

Signed-off-by: Chris Jackson <[email protected]>

Author: cdjackson

features/karaf/framework/src/main/resources/resources/bin/oh2_dir_layout

@@ -3,35 +3,41 @@
 # DIRNAME is the directory of karaf, setenv, etc.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
-export OPENHAB_HOME=`cd "$DIRNAME/.."; pwd`
+if [ -z ${OSH_HOME} ]; then
+    export OSH_HOME=`cd "$DIRNAME/.."; pwd`
+fi
 
-if [ -z ${OPENHAB_CONF} ]; then
-    export OPENHAB_CONF="${OPENHAB_HOME}/config"
+if [ -z ${OSH_CONF} ]; then
+    export OSH_CONF="${OSH_HOME}/config"
 fi
 
-if [ -z ${OPENHAB_RUNTIME} ]; then
-    export OPENHAB_RUNTIME="${OPENHAB_HOME}/data"
+if [ -z ${OSH_RUNTIME} ]; then
+    export OSH_RUNTIME="${OSH_HOME}/data"
 fi
 
-if [ -z ${OPENHAB_USERDATA} ]; then
-    export OPENHAB_USERDATA="${OPENHAB_HOME}/data"
+if [ -z ${OSH_USERDATA} ]; then
+    export OSH_USERDATA="${OSH_HOME}/data"
 fi
 
-if [ -z ${OPENHAB_LOGDIR} ]; then
-    export OPENHAB_LOGDIR="${OPENHAB_USERDATA}/log"
+if [ -z ${OSH_LOGDIR} ]; then
+    export OSH_LOGDIR="${OSH_USERDATA}/log"
 fi
 
-if [ -z ${OPENHAB_BACKUPS} ]; then
-    export OPENHAB_BACKUPS="${OPENHAB_HOME}/backups"
+if [ -z ${OSH_BACKUPS} ]; then
+    export OSH_BACKUPS="${OSH_HOME}/backups"
 fi
 
 
-# Make sure the tmp folder exists as Karaf requires it
-if [ ! -d "${OPENHAB_USERDATA}/tmp" ]; then
-    mkdir "${OPENHAB_USERDATA}/tmp"
+# Make sure the userdata and tmp folders exists as Karaf requires them
+if [ ! -d "${OSH_USERDATA}" ]; then
+    mkdir "${OSH_USERDATA}"
+fi
+
+if [ ! -d "${OSH_USERDATA}/tmp" ]; then
+    mkdir "${OSH_USERDATA}/tmp"
 fi
 
 
-#export KARAF_DATA="${OPENHAB_USERDATA}"
-#export KARAF_BASE="${OPENHAB_USERDATA}"
-#export KARAF_ETC="${OPENHAB_USERDATA}/etc"
+#export KARAF_DATA="${OSH_USERDATA}"
+#export KARAF_BASE="${OSH_USERDATA}"
+#export KARAF_ETC="${OSH_USERDATA}/etc"

features/karaf/framework/src/main/resources/resources/bin/setenv

@@ -53,7 +53,7 @@
 
 
 #
-# Import openHAB 2 directory layout
+# Import OpenSmartHouse directory layout
 #
 . "$DIRNAME/oh2_dir_layout"
 
@@ -65,23 +65,23 @@
 #
 # set listen address for HTTP(S) server
 #
-if [ ! -z ${OPENHAB_HTTP_ADDRESS} ]; then
-    HTTP_ADDRESS=${OPENHAB_HTTP_ADDRESS}
+if [ ! -z ${OSH_HTTP_ADDRESS} ]; then
+    HTTP_ADDRESS=${OSH_HTTP_ADDRESS}
 else
     HTTP_ADDRESS=0.0.0.0
 fi
 
 #
 # set ports for HTTP(S) server
 #
-if [ ! -z ${OPENHAB_HTTP_PORT} ]; then
-    HTTP_PORT=${OPENHAB_HTTP_PORT}
+if [ ! -z ${OSH_HTTP_PORT} ]; then
+    HTTP_PORT=${OSH_HTTP_PORT}
 else
     HTTP_PORT=8080
 fi
 
-if [ ! -z ${OPENHAB_HTTPS_PORT} ]; then
-    HTTPS_PORT=${OPENHAB_HTTPS_PORT}
+if [ ! -z ${OSH_HTTPS_PORT} ]; then
+    HTTPS_PORT=${OSH_HTTPS_PORT}
 else
     HTTPS_PORT=8443
 fi
@@ -91,15 +91,15 @@ fi
 #
 
 export JAVA_OPTS="${JAVA_OPTS}
-  -Dopenhab.home=${OPENHAB_HOME}
-  -Dopenhab.conf=${OPENHAB_CONF}
-  -Dopenhab.runtime=${OPENHAB_RUNTIME}
-  -Dopenhab.userdata=${OPENHAB_USERDATA}
-  -Dopenhab.logdir=${OPENHAB_LOGDIR}
-  -Djava.library.path=${OPENHAB_USERDATA}/tmp/lib
+  -Dopenhab.home=${OSH_HOME}
+  -Dopenhab.conf=${OSH_CONF}
+  -Dopenhab.runtime=${OSH_RUNTIME}
+  -Dopenhab.userdata=${OSH_USERDATA}
+  -Dopenhab.logdir=${OSH_LOGDIR}
+  -Djava.library.path=${OSH_USERDATA}/tmp/lib
   -Djetty.host=${HTTP_ADDRESS}
   -Djetty.http.compliance=RFC2616
-  -Djetty.keystore.path=${OPENHAB_CONF}/jetty.jks
+  -Djetty.keystore.path=${OSH_CONF}/jetty.jks
   -Dorg.ops4j.pax.web.listening.addresses=${HTTP_ADDRESS}
   -Dorg.osgi.service.http.port=${HTTP_PORT}
   -Dorg.osgi.service.http.port.secure=${HTTPS_PORT}"