diff options
| author | Christoph Scholz | 2020-12-05 16:38:48 +0100 |
|---|---|---|
| committer | Christoph Scholz | 2020-12-05 16:38:48 +0100 |
| commit | 96c422f41a11bab72ba43f4e0ff49e24cd307dfc (patch) | |
| tree | a41f0c1b67fa0d93b837d265ae49248ccd162a51 | |
| parent | 535457e6318adbb1ca92c10663d2e16c598354a6 (diff) | |
| download | aur-96c422f41a11bab72ba43f4e0ff49e24cd307dfc.tar.gz | |
select specific java version on startup
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 7 | ||||
| -rw-r--r-- | openhab3.service | 4 |
3 files changed, 6 insertions, 8 deletions
@@ -6,6 +6,7 @@ pkgbase = openhab3-snapshot arch = any license = EPL depends = java-runtime-headless=11 + depends = archlinux-java-run conflicts = openhab3 backup = etc/openhab3/services/addons.cfg backup = etc/openhab3/services/runtime.cfg @@ -18,7 +19,7 @@ pkgbase = openhab3-snapshot source = openhab3.default source = openhab3.patch sha256sums = SKIP - sha256sums = 9b42de40f82dfe1fcb5efcac5f69d948e39f955e85c6273daddd97bc94ac34b6 + sha256sums = 11406a8d4c4e2dc57fab1a894f15f2f1fbcc09cabb7761218ba3cdc413477515 sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7 sha256sums = 3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b @@ -7,7 +7,7 @@ pkgdesc="openhab3 open source home automation software" arch=("any") url="http://www.openhab.org/" license=("EPL") -depends=("java-runtime-headless=11") +depends=("java-runtime-headless=11" "archlinux-java-run") conflicts=("openhab3") @@ -24,7 +24,7 @@ source=("openhab-${pkgver}-SNAPSHOT.tar.gz::https://ci.openhab.org/job/openHAB3- "${_pkgbase}.patch") sha256sums=('SKIP' - '9b42de40f82dfe1fcb5efcac5f69d948e39f955e85c6273daddd97bc94ac34b6' + 'e4b374cf5d590e8a91a43ab5cc8be9d82f6ebff22c3ce0ee767dc13ffc1ebe1d' 'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7' '3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b') @@ -45,9 +45,6 @@ package() { mkdir -p "${pkgdir}/usr/share/${_pkgbase}" cp -r "${srcdir}/runtime" "${pkgdir}/usr/share/${_pkgbase}" cp -r "${srcdir}/addons" "${pkgdir}/usr/share/${_pkgbase}" - cp "${srcdir}/start.sh" "${pkgdir}/usr/share/${_pkgbase}" - cp "${srcdir}/start_debug.sh" "${pkgdir}/usr/share/${_pkgbase}" - cp "${srcdir}/LICENSE.TXT" "${pkgdir}/usr/share/${_pkgbase}" mkdir -p "${pkgdir}/var/log/${_pkgbase}" diff --git a/openhab3.service b/openhab3.service index 088e38f61ec0..8eac3d1e004d 100644 --- a/openhab3.service +++ b/openhab3.service @@ -10,8 +10,8 @@ User=openhab3 Group=openhab3 WorkingDirectory=/usr/share/openhab3 EnvironmentFile=/etc/default/openhab3 -ExecStart=/usr/share/openhab3/start.sh server -ExecStop=/bin/kill -SIGINT $MAINPID +ExecStart=/bin/bash -c 'JAVA_HOME=$(archlinux-java-run -a 11 -b 11 -j) exec /usr/share/openhab3/runtime/bin/karaf server' +ExecStop=/bin/bash -c 'JAVA_HOME=$(archlinux-java-run -a 11 -b 11 -j) exec /usr/share/openhab3/runtime/bin/karaf stop' Restart=on-failure [Install] |