diff options
| author | Christoph Scholz | 2020-12-06 15:01:09 +0100 |
|---|---|---|
| committer | Christoph Scholz | 2020-12-06 15:04:47 +0100 |
| commit | 3b5b0e2b95c3382e7e53e0cfda29754f0dcff817 (patch) | |
| tree | 15eeb4b487de7618677f403c28ec8156252bc3d9 | |
| parent | 2e9fc28fb8d5eef11f4d1062ee6f23dbe3e079cd (diff) | |
| download | aur-3b5b0e2b95c3382e7e53e0cfda29754f0dcff817.tar.gz | |
added karaf_wrapper.sh
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rwxr-xr-x | karaf_wrapper.sh | 8 | ||||
| -rw-r--r-- | openhab3.service | 4 |
4 files changed, 21 insertions, 8 deletions
@@ -19,10 +19,12 @@ pkgbase = openhab3-snapshot source = openhab3.service source = openhab3.default source = openhab3.patch + source = karaf_wrapper.sh sha256sums = SKIP - sha256sums = e4b374cf5d590e8a91a43ab5cc8be9d82f6ebff22c3ce0ee767dc13ffc1ebe1d + sha256sums = 995bb5eacc583c22fe97555fd67e69911a63cfb02449a046481b5a0e64f4032c sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7 sha256sums = 3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b + sha256sums = 9f5185d7f301d7abf5bd362710c89af43fb8391e13010226d43677ba2fc79762 pkgname = openhab3-snapshot @@ -22,20 +22,22 @@ backup=("etc/${_pkgbase}/services/addons.cfg" source=("openhab-${pkgver}-SNAPSHOT.tar.gz::https://ci.openhab.org/job/openHAB3-Distribution/lastSuccessfulBuild/artifact/distributions/openhab/target/openhab-${pkgver}-SNAPSHOT.tar.gz" "${_pkgbase}.service" "${_pkgbase}.default" - "${_pkgbase}.patch") + "${_pkgbase}.patch" + "karaf_wrapper.sh") sha256sums=('SKIP' - 'e4b374cf5d590e8a91a43ab5cc8be9d82f6ebff22c3ce0ee767dc13ffc1ebe1d' + '995bb5eacc583c22fe97555fd67e69911a63cfb02449a046481b5a0e64f4032c' 'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7' - '3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b') + '3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b' + '9f5185d7f301d7abf5bd362710c89af43fb8391e13010226d43677ba2fc79762') prepare() { patch -p1 < ../${_pkgbase}.patch } package() { - install -Dm644 ${_pkgbase}.default "${pkgdir}/etc/default/${_pkgbase}" - install -Dm644 ${_pkgbase}.service "${pkgdir}/usr/lib/systemd/system/${_pkgbase}.service" + install -Dm644 "${srcdir}/${_pkgbase}.default" "${pkgdir}/etc/default/${_pkgbase}" + install -Dm644 "${srcdir}/${_pkgbase}.service" "${pkgdir}/usr/lib/systemd/system/${_pkgbase}.service" mkdir -p "${pkgdir}/etc/${_pkgbase}" cp -r ${srcdir}/conf/* "${pkgdir}/etc/${_pkgbase}" @@ -46,6 +48,7 @@ package() { mkdir -p "${pkgdir}/usr/share/${_pkgbase}" cp -r "${srcdir}/runtime" "${pkgdir}/usr/share/${_pkgbase}" cp -r "${srcdir}/addons" "${pkgdir}/usr/share/${_pkgbase}" + install -m755 "${srcdir}/karaf_wrapper.sh" "${pkgdir}/usr/share/${_pkgbase}/karaf_wrapper.sh" mkdir -p "${pkgdir}/var/log/${_pkgbase}" diff --git a/karaf_wrapper.sh b/karaf_wrapper.sh new file mode 100755 index 000000000000..0017e194e7d9 --- /dev/null +++ b/karaf_wrapper.sh @@ -0,0 +1,8 @@ +#!/bin/sh +if [[ -z "${JAVA_HOME}" ]]; then + JAVA_HOME_DETECTED=$(archlinux-java-run --min 11 --max 11 --java-home) + if (( $? == 0 )); then + export JAVA_HOME=${JAVA_HOME_DETECTED} + fi +fi +exec /usr/share/openhab3/runtime/bin/karaf "${@}" diff --git a/openhab3.service b/openhab3.service index 8eac3d1e004d..ee6fd55d9be9 100644 --- a/openhab3.service +++ b/openhab3.service @@ -10,8 +10,8 @@ User=openhab3 Group=openhab3 WorkingDirectory=/usr/share/openhab3 EnvironmentFile=/etc/default/openhab3 -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' +ExecStart=/usr/share/openhab3/karaf_wrapper.sh server +ExecStop=/usr/share/openhab3/karaf_wrapper.sh stop Restart=on-failure [Install] |