simplified PKGBUILD

4 files changed, 38 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4342b90f4540..3ca767c365f9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -3,7 +3,6 @@ pkgbase = openhab3
 	pkgver = 3.0.0.M4
 	pkgrel = 1
 	url = http://www.openhab.org/
-	install = openhab3.install
 	arch = any
 	license = EPL
 	depends = java-runtime-headless=11
@@ -21,12 +20,10 @@ pkgbase = openhab3
 	source = openhab-3.0.0.M4.tar.gz::https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/3.0.0.M4/openhab-3.0.0.M4.tar.gz
 	source = openhab3.service
 	source = openhab3.default
-	source = openhab3.install
 	source = openhab3.patch
 	sha256sums = 63b1725ab2e37ee25649663362fb08bedb6f9c1727c5511543eef2d8048d008c
-	sha256sums = a948b1c74fe41038ca2aa6a7c46416c7ad15eab4b22948161b95b092b9e8c642
+	sha256sums = 9b42de40f82dfe1fcb5efcac5f69d948e39f955e85c6273daddd97bc94ac34b6
 	sha256sums = b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7
-	sha256sums = 3f75538c64fd02120ccfcfa1024e8414514536708255e9218b5cc0bd995715c5
 	sha256sums = 3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b
 
 pkgname = openhab3
diff --git a/PKGBUILD b/PKGBUILD
index 750424aad441..aa15ecd1f27a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,63 +3,60 @@ pkgname=openhab3
 pkgver=3.0.0.M4
 pkgrel=1
 pkgdesc="openhab3 open source home automation software"
-arch=('any')
+arch=("any")
 url="http://www.openhab.org/"
-license=('EPL')
-depends=('java-runtime-headless=11')
+license=("EPL")
+depends=("java-runtime-headless=11")
 
-conflicts=('openhab-runtime' 'openhab-addons' 'openhab-beta' 'openhab2')
+conflicts=("openhab-runtime" "openhab-addons" "openhab-beta" "openhab2")
 
-backup=('etc/openhab3/services/addons.cfg'
-		'etc/openhab3/services/runtime.cfg'
-		'etc/default/openhab3'
-		'var/lib/openhab3/etc/keystore'
-		'var/lib/openhab3/etc/users.properties'
-		'var/lib/openhab3/etc/keys.properties')
-
-install="${pkgname}.install"
+backup=("etc/${pkgname}/services/addons.cfg"
+        "etc/${pkgname}/services/runtime.cfg"
+        "etc/default/${pkgname}"
+        "var/lib/${pkgname}/etc/keystore"
+        "var/lib/${pkgname}/etc/users.properties"
+        "var/lib/${pkgname}/etc/keys.properties")
 
 source=("openhab-${pkgver}.tar.gz::https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/${pkgver}/openhab-${pkgver}.tar.gz"
-        "openhab3.service"
-	"openhab3.default"
-	"openhab3.install"
-	"openhab3.patch")
+        "${pkgname}.service"
+        "${pkgname}.default"
+        "${pkgname}.patch")
 
 noextract=("openhab-${pkgver}.tar.gz")
 
 sha256sums=('63b1725ab2e37ee25649663362fb08bedb6f9c1727c5511543eef2d8048d008c'
-            'a948b1c74fe41038ca2aa6a7c46416c7ad15eab4b22948161b95b092b9e8c642'
+            '9b42de40f82dfe1fcb5efcac5f69d948e39f955e85c6273daddd97bc94ac34b6'
             'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
-            '3f75538c64fd02120ccfcfa1024e8414514536708255e9218b5cc0bd995715c5'
             '3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b')
 
 prepare() {
-	if [[ ! -d ${srcdir}/openhab3 ]]; then
-		mkdir ${srcdir}/openhab3
-	fi
-	cd ${srcdir}/openhab3
-	tar xzf ${srcdir}/openhab-${pkgver}.tar.gz
-	patch -p1 < ../openhab3.patch
+    if [[ ! -d ${srcdir}/${pkgname} ]]; then
+        mkdir ${srcdir}/${pkgname}
+    fi
+    cd ${srcdir}/${pkgname}
+    tar xzf ${srcdir}/openhab-${pkgver}.tar.gz
+    patch -p1 < ../${pkgname}.patch
 }
 
 package() {
+    install -Dm644 ${pkgname}.default "${pkgdir}/etc/default/${pkgname}"
+    install -Dm644 ${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
-	install -Dm644 openhab3.default "${pkgdir}/etc/default/openhab3"
-	install -Dm644 openhab3.service "${pkgdir}/usr/lib/systemd/system/openhab3.service"
-
-
-	mkdir -p "${pkgdir}/etc/openhab3"
-	cp -r ${srcdir}/openhab3/conf/* "${pkgdir}/etc/openhab3"
-
-	mkdir -p "${pkgdir}/var/lib/openhab3"
-	cp -r ${srcdir}/openhab3/userdata/* "${pkgdir}/var/lib/openhab3"
+    mkdir -p "${pkgdir}/etc/${pkgname}"
+    cp -r ${srcdir}/${pkgname}/conf/* "${pkgdir}/etc/${pkgname}"
 
-	mkdir -p "${pkgdir}/usr/share"
-	cp -r "${srcdir}/openhab3" "${pkgdir}/usr/share"
+    mkdir -p "${pkgdir}/var/lib/${pkgname}"
+    cp -r ${srcdir}/${pkgname}/userdata/* "${pkgdir}/var/lib/${pkgname}"
 
-	rm -fr "${pkgdir}/usr/share/openhab3/conf"
-	rm -fr "${pkgdir}/usr/share/openhab3/userdata"
+    mkdir -p "${pkgdir}/usr/share"
+    cp -r "${srcdir}/${pkgname}" "${pkgdir}/usr/share"
 
-	mkdir -p "${pkgdir}/var/log/openhab3"
+    rm -fr "${pkgdir}/usr/share/${pkgname}/conf"
+    rm -fr "${pkgdir}/usr/share/${pkgname}/userdata"
 
+    echo "u ${pkgname} - - /usr/share/${pkgname}" | install -Dm644 /dev/stdin "${pkgdir}"/usr/lib/sysusers.d/"${pkgname}".conf
+    echo "Z /etc/${pkgname} - ${pkgname} ${pkgname} -" | install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    echo "Z /usr/share/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    echo "Z /var/lib/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+    echo "d /var/log/${pkgname} - ${pkgname} ${pkgname} -" >> "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/openhab3.install b/openhab3.install
deleted file mode 100644
index 8694fa8b75d8..000000000000
--- a/openhab3.install
+++ /dev/null
@@ -1,29 +0,0 @@
-_user="openhab"
-
-post_install() {
-	getent group "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo -e "\e[34;1m==>\e[39;1m Adding ${_user} system group... \e[0m"
-		groupadd -r ${_user} 1>/dev/null
-	fi
-
-	getent passwd "${_user}" &>/dev/null
-	if [ $? -ne 0 ]; then
-		echo -e "\e[34;1m==>\e[39;1m Adding ${_user} system user... \e[0m"
-		useradd -r -g ${_user} -G audio -d /usr/share/openhab3 ${_user} 1>/dev/null
-	fi
-
-	post_upgrade
-}
-
-post_upgrade() {
-	chown -R ${_user}:${_user} /etc/openhab3
-	chown -R ${_user}:${_user} /usr/share/openhab3
-	chown -R ${_user}:${_user} /var/lib/openhab3
-	chown -R ${_user}:${_user} /var/log/openhab3
-}
-
-post_remove() {
-	# Notifying the user of kept dirs
-	echo -e "\e[34;1m==>\e[39;1m NOTE: The ${_user} user was preserved on your system. \e[0m"
-}
diff --git a/openhab3.service b/openhab3.service
index aad0277a25a8..088e38f61ec0 100644
--- a/openhab3.service
+++ b/openhab3.service
@@ -6,8 +6,8 @@ After=network-online.target
 
 [Service]
 Type=simple
-User=openhab
-Group=openhab
+User=openhab3
+Group=openhab3
 WorkingDirectory=/usr/share/openhab3
 EnvironmentFile=/etc/default/openhab3
 ExecStart=/usr/share/openhab3/start.sh server