added karaf_wrapper.sh

4 files changed, 21 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2e2a24f1a5cb..6632bc020b42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openhab2
 	pkgdesc = openHAB2 open source home automation software
 	pkgver = 2.5.10
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.openhab.org/
 	install = openhab2.install
 	arch = any
@@ -23,11 +23,13 @@ pkgbase = openhab2
 	source = openhab2.default
 	source = openhab2.install
 	source = openhab2.patch
+	source = karaf_wrapper.sh
 	sha256sums = d00bc6f0d662afd36802b496e82d6307a076053ac9097805684e25619a76b6b2
-	sha256sums = 1d4839f7e55c354bcd36a43538938d0eb2c3cceb7e27bbf5c9cb1627ef7bbd85
+	sha256sums = d7bb21c0e0dc27534af29a9a5538ccbcf801b08afe41ba84be738f44456510aa
 	sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7
 	sha256sums = c6ddfcf9d38882ef50cdff6eb9a5df4d3577c07771a8c6d91484d1d84ad63705
 	sha256sums = 500118875b0a9f3a4a511bebea3aebaebaa1e8fb5fc1e5c9222e3a287530a5ab
+	sha256sums = d61ebec172e2a173dbe94f534035b55250e1b09f4cab5665d275ccfcdf3e710e
 
 pkgname = openhab2
 
diff --git a/PKGBUILD b/PKGBUILD
index dbf638d1f007..d0e0c2ac9054 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christoph Scholz <christoph.scholz@gmail.com>
 pkgname=openhab2
 pkgver=2.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="openHAB2 open source home automation software"
 arch=('any')
 url="http://www.openhab.org/"
@@ -23,15 +23,17 @@ source=("openhab-${pkgver}.tar.gz::https://bintray.com/openhab/mvn/download_file
         "openhab2.service"
 	"openhab2.default"
 	"openhab2.install"
-	"openhab2.patch")
+	"openhab2.patch"
+	"karaf_wrapper.sh")
 
 noextract=("openhab-${pkgver}.tar.gz")
 
 sha256sums=('d00bc6f0d662afd36802b496e82d6307a076053ac9097805684e25619a76b6b2'
-            '1d4839f7e55c354bcd36a43538938d0eb2c3cceb7e27bbf5c9cb1627ef7bbd85'
+            'd7bb21c0e0dc27534af29a9a5538ccbcf801b08afe41ba84be738f44456510aa'
             'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
             'c6ddfcf9d38882ef50cdff6eb9a5df4d3577c07771a8c6d91484d1d84ad63705'
-            '500118875b0a9f3a4a511bebea3aebaebaa1e8fb5fc1e5c9222e3a287530a5ab')
+            '500118875b0a9f3a4a511bebea3aebaebaa1e8fb5fc1e5c9222e3a287530a5ab'
+            'd61ebec172e2a173dbe94f534035b55250e1b09f4cab5665d275ccfcdf3e710e')
 
 prepare() {
 	if [[ ! -d ${srcdir}/openhab2 ]]; then
@@ -46,7 +48,7 @@ package() {
 
 	install -Dm644 openhab2.default "${pkgdir}/etc/default/openhab2"
 	install -Dm644 openhab2.service "${pkgdir}/usr/lib/systemd/system/openhab2.service"
-
+	install -Dm755 karaf_wrapper.sh "${pkgdir}/usr/share/openhab2/karaf_wrapper.sh"
 
 	mkdir -p "${pkgdir}/etc/openhab2"
 	cp -r ${srcdir}/openhab2/conf/* "${pkgdir}/etc/openhab2"
diff --git a/karaf_wrapper.sh b/karaf_wrapper.sh
new file mode 100755
index 000000000000..58efe67a206e
--- /dev/null
+++ b/karaf_wrapper.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+if [[ -z "${JAVA_HOME}" ]]; then
+    JAVA_HOME_DETECTED=$(archlinux-java-run -a 8 -b 8 -j)
+    if (( $? == 0 )); then
+        export JAVA_HOME=${JAVA_HOME_DETECTED}
+    fi
+fi
+exec /usr/share/openhab2/runtime/bin/karaf "${@}"
diff --git a/openhab2.service b/openhab2.service
index 1b9c5e34f86e..1c13e3d7f8b8 100644
--- a/openhab2.service
+++ b/openhab2.service
@@ -10,8 +10,8 @@ User=openhab
 Group=openhab
 WorkingDirectory=/usr/share/openhab2
 EnvironmentFile=/etc/default/openhab2
-ExecStart=/bin/bash -c 'JAVA_HOME=$(archlinux-java-run -a 8 -b 8 -j) exec /usr/share/openhab2/runtime/bin/karaf server'
-ExecStop=/bin/bash -c 'JAVA_HOME=$(archlinux-java-run -a 8 -b 8 -j) exec /usr/share/openhab2/runtime/bin/karaf stop'
+ExecStart=/usr/share/openhab2/karaf_wrapper.sh server
+ExecStop=/usr/share/openhab2/karaf_wrapper.sh stop
 Restart=on-failure
 
 [Install]