From 5156bc8da8ac092ac89a210f0577910ebd3c4d4f Mon Sep 17 00:00:00 2001 From: Bazaah Date: Sun, 11 Feb 2024 18:47:19 +0000 Subject: [PATCH] pkgbuild: fixes to package(), install LICENSE - Move usr/share content to $pkgname (over 'consul') - Copy license file over - Improvements to structure, formatting --- PKGBUILD | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index bdbf928..767b8bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -68,15 +68,20 @@ check() { package() { cd "${srcdir}/${pkgname}" - install -D -d -m750 -o 208 -g 208 "${pkgdir}/var/lib/consul" - install -D -d -m750 -o 0 -g 208 "${pkgdir}/etc/consul.d" + # dirs + install -D -m750 -o 208 -g 208 -d "${pkgdir}/var/lib/consul" + install -D -m755 -o 0 -g 208 -d "${pkgdir}/etc/consul.d" - install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul" - install -D -m644 -o 0 -g 0 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/consul/config.example.json" - install -Dm755 "build/consul" "${pkgdir}/usr/bin/consul" + # configuration + install -D -m644 "${srcdir}/consul.default" "${pkgdir}/etc/default/consul" + install -D -m644 "${srcdir}/example.json" "${pkgdir}/usr/share/doc/${pkgname}/config.example.json" + install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - install -Dm644 "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service" - install -Dm644 "${srcdir}/consul.sysusers" "${pkgdir}/usr/lib/sysusers.d/consul.conf" + install -D -m644 "${srcdir}/consul.service" "${pkgdir}/usr/lib/systemd/system/consul.service" + install -D -m644 "${srcdir}/consul.sysusers" "${pkgdir}/usr/lib/sysusers.d/consul.conf" + + # binaries + install -Dm755 "build/consul" "${pkgdir}/usr/bin/consul" } # vim:set ts=2 sw=2 et: