diff options
| author | Christoph Scholz | 2020-12-05 07:45:18 +0100 |
|---|---|---|
| committer | Christoph Scholz | 2020-12-05 07:45:18 +0100 |
| commit | 045929ff7e9c82a84faaaeba008149d782c2e5cd (patch) | |
| tree | 58bafd5eca0131b0b96723b9679cf9db40a36917 | |
| parent | 54b7fa8955b01791de021fcf3a6bbd5533d1503e (diff) | |
| download | aur-045929ff7e9c82a84faaaeba008149d782c2e5cd.tar.gz | |
select specific java version on startup
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | openhab2.service | 4 |
3 files changed, 8 insertions, 7 deletions
@@ -1,12 +1,13 @@ pkgbase = openhab2 pkgdesc = openHAB2 open source home automation software pkgver = 2.5.10 - pkgrel = 1 + pkgrel = 2 url = http://www.openhab.org/ install = openhab2.install arch = any license = EPL depends = java-runtime-headless=8 + depends = archlinux-java-run conflicts = openhab-runtime conflicts = openhab-addons conflicts = openhab-beta @@ -23,7 +24,7 @@ pkgbase = openhab2 source = openhab2.install source = openhab2.patch sha256sums = d00bc6f0d662afd36802b496e82d6307a076053ac9097805684e25619a76b6b2 - sha256sums = f01ea4cd08608fa0230e13dda23ec9f0b363a1ba417a78908866083a03ab9e0c + sha256sums = 1d4839f7e55c354bcd36a43538938d0eb2c3cceb7e27bbf5c9cb1627ef7bbd85 sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7 sha256sums = c6ddfcf9d38882ef50cdff6eb9a5df4d3577c07771a8c6d91484d1d84ad63705 sha256sums = 500118875b0a9f3a4a511bebea3aebaebaa1e8fb5fc1e5c9222e3a287530a5ab @@ -1,12 +1,12 @@ # Maintainer: Christoph Scholz <christoph.scholz@gmail.com> pkgname=openhab2 pkgver=2.5.10 -pkgrel=1 +pkgrel=2 pkgdesc="openHAB2 open source home automation software" arch=('any') url="http://www.openhab.org/" license=('EPL') -depends=('java-runtime-headless=8') +depends=('java-runtime-headless=8' 'archlinux-java-run') conflicts=('openhab-runtime' 'openhab-addons' 'openhab-beta') @@ -28,7 +28,7 @@ source=("openhab-${pkgver}.tar.gz::https://bintray.com/openhab/mvn/download_file noextract=("openhab-${pkgver}.tar.gz") sha256sums=('d00bc6f0d662afd36802b496e82d6307a076053ac9097805684e25619a76b6b2' - 'f01ea4cd08608fa0230e13dda23ec9f0b363a1ba417a78908866083a03ab9e0c' + '1d4839f7e55c354bcd36a43538938d0eb2c3cceb7e27bbf5c9cb1627ef7bbd85' 'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7' 'c6ddfcf9d38882ef50cdff6eb9a5df4d3577c07771a8c6d91484d1d84ad63705' '500118875b0a9f3a4a511bebea3aebaebaa1e8fb5fc1e5c9222e3a287530a5ab') diff --git a/openhab2.service b/openhab2.service index e0e0102a070f..1b9c5e34f86e 100644 --- a/openhab2.service +++ b/openhab2.service @@ -10,8 +10,8 @@ User=openhab Group=openhab WorkingDirectory=/usr/share/openhab2 EnvironmentFile=/etc/default/openhab2 -ExecStart=/usr/share/openhab2/start.sh server -ExecStop=/bin/kill -SIGINT $MAINPID +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' Restart=on-failure [Install] |