bumped to version 2.1.0

1 files changed, 23 insertions, 14 deletions

diff --git a/openhab2.patch b/openhab2.patch
index fd2552328dda..806ecbe390e2 100644
--- a/openhab2.patch
+++ b/openhab2.patch
@@ -1,17 +1,26 @@
 diff -ura openhab2.orig/runtime/bin/oh2_dir_layout openhab2.new/runtime/bin/oh2_dir_layout
---- openhab2.orig/runtime/bin/oh2_dir_layout	2017-01-21 12:35:42.000000000 +0100
-+++ openhab2.new/runtime/bin/oh2_dir_layout	2017-05-04 17:53:51.790080596 +0200
-@@ -4,10 +4,10 @@
- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
+--- openhab2.orig/runtime/bin/oh2_dir_layout	2017-06-27 23:14:06.000000000 +0200
++++ openhab2.new/runtime/bin/oh2_dir_layout	2017-07-01 14:54:58.966716130 +0200
+@@ -6,7 +6,7 @@
  export OPENHAB_HOME=`cd "$DIRNAME/../.."; pwd`
--export OPENHAB_CONF="${OPENHAB_HOME}/conf"
-+export OPENHAB_CONF="/etc/openhab2"
- export OPENHAB_RUNTIME="${OPENHAB_HOME}/runtime"
--export OPENHAB_USERDATA="${OPENHAB_HOME}/userdata"
--export OPENHAB_LOGDIR="${OPENHAB_USERDATA}/logs"
-+export OPENHAB_USERDATA="/var/lib/openhab2"
-+export OPENHAB_LOGDIR="/var/log/openhab2"
  
- export KARAF_HOME="${OPENHAB_RUNTIME}"
- export KARAF_DATA="${OPENHAB_USERDATA}"
+ if [ -z ${OPENHAB_CONF} ]; then
+-    export OPENHAB_CONF="${OPENHAB_HOME}/conf"
++    export OPENHAB_CONF="/etc/openhab2"
+ fi
+ 
+ if [ -z ${OPENHAB_RUNTIME} ]; then
+@@ -14,11 +14,11 @@
+ fi
+ 
+ if [ -z ${OPENHAB_USERDATA} ]; then
+-    export OPENHAB_USERDATA="${OPENHAB_HOME}/userdata"
++    export OPENHAB_USERDATA="/var/lib/openhab2"
+ fi
+ 
+ if [ -z ${OPENHAB_LOGDIR} ]; then
+-    export OPENHAB_LOGDIR="${OPENHAB_USERDATA}/logs"
++    export OPENHAB_LOGDIR="/var/log/openhab2"
+ fi
+ 
+ # Make sure the tmp folder exists as Karaf requires it