diff --git a/.gitignore b/.gitignore index acf92f2..89291af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ /env* __pycache__ -*.pkg.tar.zst -/nummi-git/ -/pkg/ -/src/ /media diff --git a/pkgbuild/.gitignore b/pkgbuild/.gitignore new file mode 100644 index 0000000..19f79ea --- /dev/null +++ b/pkgbuild/.gitignore @@ -0,0 +1,3 @@ +/*.pkg.tar.zst +/src/ +/nummi/ diff --git a/pkgbuild/PKGBUILD b/pkgbuild/PKGBUILD index bad6c31..871eefd 100644 --- a/pkgbuild/PKGBUILD +++ b/pkgbuild/PKGBUILD @@ -1,5 +1,5 @@ -pkgname=nummi-git -pkgver=r298.2c95379 +pkgname=nummi +pkgver=v0.9 pkgrel=1 pkgdesc="Web-based accounting interface" arch=("any") @@ -13,13 +13,14 @@ depends=( ) makedepends=("git") optdepends=("postgresql: database") -backup=("etc/${pkgname%-git}/config.toml") +backup=("etc/${pkgname}/config.toml") +_tag=c29a01ed5821787bfcef7afbdb100604feab97d0 source=( - "${pkgname}::git+https://git.edgarpierre.fr/edpibu/nummi" - "${pkgname%-git}.service" - "${pkgname%-git}.tmpfiles" - "${pkgname%-git}.sysusers" - "${pkgname%-git}.nginx" + "${pkgname}::git+https://git.edgarpierre.fr/edpibu/nummi?signed#tag=$_tag" + "${pkgname}.service" + "${pkgname}.tmpfiles" + "${pkgname}.sysusers" + "${pkgname}.nginx" "config.toml" ) b2sums=('SKIP' @@ -31,16 +32,16 @@ b2sums=('SKIP' pkgver() { cd "$pkgname" - printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + git describe } package() { - install -Dm644 ${pkgname%-git}.service -t "${pkgdir}"/usr/lib/systemd/system/ - install -Dm644 ${pkgname%-git}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname%-git}.conf - install -Dm644 ${pkgname%-git}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname%-git}.conf - install -Dm644 ${pkgname%-git}.nginx "${pkgdir}"/etc/nginx/sites-enabled/${pkgname%-git}.conf - install -Dm750 -o nummi -g nummi config.toml -t "${pkgdir}"/etc/${pkgname%-git}/ + install -Dm644 ${pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/ + install -Dm644 ${pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${pkgname}.conf + install -Dm644 ${pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${pkgname}.conf + install -Dm644 ${pkgname}.nginx "${pkgdir}"/etc/nginx/sites-enabled/${pkgname}.conf + install -Dm600 -o nummi -g nummi config.toml -t "${pkgdir}"/etc/${pkgname}/ - cd ${pkgname}/${pkgname%-git} - find * -type f -exec install -Dm0644 "{}" "${pkgdir}/usr/share/webapps/${pkgname%-git}/{}" \; + cd ${pkgname}/${pkgname} + find * -type f -exec install -Dm0644 "{}" "${pkgdir}/usr/share/webapps/${pkgname}/{}" \; }