simplified PKGBUILD even more

2 files changed, 9 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f28549090aec..f83301e094dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,7 +6,6 @@ pkgbase = openhab3
 	arch = any
 	license = EPL
 	depends = java-runtime-headless=11
-	noextract = openhab-3.0.0.M4.tar.gz
 	backup = etc/openhab3/services/addons.cfg
 	backup = etc/openhab3/services/runtime.cfg
 	backup = etc/default/openhab3
diff --git a/PKGBUILD b/PKGBUILD
index 5e4a08d24fdc..8f71a4a70e32 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,19 +20,12 @@ source=("openhab-${pkgver}.tar.gz::https://openhab.jfrog.io/openhab/libs-milesto
         "${pkgname}.default"
         "${pkgname}.patch")
 
-noextract=("openhab-${pkgver}.tar.gz")
-
 sha256sums=('63b1725ab2e37ee25649663362fb08bedb6f9c1727c5511543eef2d8048d008c'
             '9b42de40f82dfe1fcb5efcac5f69d948e39f955e85c6273daddd97bc94ac34b6'
             'b149d976dc13dc18c62d2014457557e266e733ead70b0730d06dcd0372da78a7'
             '3f7478e5742ff504b3200b580eba84bd10f9adde24c0a5e070dda71125a69c3b')
 
 prepare() {
-    if [[ ! -d ${srcdir}/${pkgname} ]]; then
-        mkdir ${srcdir}/${pkgname}
-    fi
-    cd ${srcdir}/${pkgname}
-    tar xzf ${srcdir}/openhab-${pkgver}.tar.gz
     patch -p1 < ../${pkgname}.patch
 }
 
@@ -41,20 +34,21 @@ package() {
     install -Dm644 ${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
 
     mkdir -p "${pkgdir}/etc/${pkgname}"
-    cp -r ${srcdir}/${pkgname}/conf/* "${pkgdir}/etc/${pkgname}"
+    cp -r ${srcdir}/conf/* "${pkgdir}/etc/${pkgname}"
 
     mkdir -p "${pkgdir}/var/lib/${pkgname}"
-    cp -r ${srcdir}/${pkgname}/userdata/* "${pkgdir}/var/lib/${pkgname}"
+    cp -r ${srcdir}/userdata/* "${pkgdir}/var/lib/${pkgname}"
 
-    mkdir -p "${pkgdir}/usr/share"
-    cp -r "${srcdir}/${pkgname}" "${pkgdir}/usr/share"
+    mkdir -p "${pkgdir}/usr/share/${pkgname}"
+    cp -r "${srcdir}/runtime" "${pkgdir}/usr/share/${pkgname}"
+    cp -r "${srcdir}/addons" "${pkgdir}/usr/share/${pkgname}"
+    cp  "${srcdir}/start.sh" "${pkgdir}/usr/share/${pkgname}"
+    cp  "${srcdir}/start_debug.sh" "${pkgdir}/usr/share/${pkgname}"
+    cp  "${srcdir}/LICENSE.TXT" "${pkgdir}/usr/share/${pkgname}"
 
     mkdir -p "${pkgdir}/var/log/${pkgname}"
 
-    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 "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"