diff options
| author | Donald Webster | 2018-03-18 20:26:07 -0700 |
|---|---|---|
| committer | Donald Webster | 2018-03-18 20:26:17 -0700 |
| commit | ad89fd66e578ace737e3d5bf6a35be8a380a62f6 (patch) | |
| tree | a6f0a7cc3add90b5042a7cf3e55995a13c7f9de1 | |
| parent | a0771dbe9dbf8af20173e836b2793a9d4fafdae2 (diff) | |
| download | aur-ad89fd66e578ace737e3d5bf6a35be8a380a62f6.tar.gz | |
Switch to systemd tmpfiles.
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | ubooquity.install | 11 | ||||
| -rw-r--r-- | ubooquity.tmpfiles | 3 |
5 files changed, 16 insertions, 23 deletions
@@ -1,11 +1,8 @@ -# Generated by mksrcinfo v8 -# Fri Oct 6 14:46:51 UTC 2017 pkgbase = ubooquity pkgdesc = Home server for comics and ebooks. pkgver = 2.1.1 - pkgrel = 2 + pkgrel = 3 url = https://vaemendis.net/ubooquity/ - install = ubooquity.install arch = any license = custom depends = java-runtime-headless>=8 @@ -13,9 +10,11 @@ pkgbase = ubooquity source = http://vaemendis.net/ubooquity/downloads/Ubooquity-2.1.1.zip source = ubooquity.service source = ubooquity.sysusers + source = ubooquity.tmpfiles sha512sums = 70d0d9f6aec9e80342ab338b03ebdd8e8aa54e0cd24c914a12a785167296d78ab041bebf4f73affb2a71b97a58ea18bb0e813c88377f0d4a45bdb12550a4b25e sha512sums = e46ec0e8e903ca1e21e824c420e237c4fb894047c1bfa6385ebb9b49843237355dfb92ebe57518c8620ab46928cfe0b41c4dc7cacbeb01ef1410495d19fc5f3c sha512sums = d4165d6e22b5e15e308f197ba1193b9a8724a327622f41af0baf451053b55b0280cddcea96e2d16772d7f055a980336de8459b43687431aacec9d164dc63eb9e + sha512sums = ccf5219017ba1518bc6be6233a115e422e80117fe5ccd466b71996b2e376b7ba3e050cdbc54c8eae623a7d8c118d962ac87b57a4d4851f059f530a0da9bfe973 pkgname = ubooquity diff --git a/.gitignore b/.gitignore index bbf0d2d6081f..8c5130015a8b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /*.zip +/*.xz +/*.log /src/ /pkg/ @@ -1,28 +1,28 @@ # Maintainer: Donald Webster <fryfrog@gmail.com> pkgname="ubooquity" pkgver="2.1.1" -pkgrel=2 +pkgrel=3 pkgdesc="Home server for comics and ebooks." arch=(any) url="https://vaemendis.net/ubooquity/" license=('custom') depends=('java-runtime-headless>=8') optdepends=('java-runtime>=8: For Ubooquity GUI') -install='ubooquity.install' source=("http://vaemendis.net/ubooquity/downloads/Ubooquity-${pkgver}.zip" 'ubooquity.service' - 'ubooquity.sysusers') -noextract=() + 'ubooquity.sysusers' + 'ubooquity.tmpfiles') sha512sums=('70d0d9f6aec9e80342ab338b03ebdd8e8aa54e0cd24c914a12a785167296d78ab041bebf4f73affb2a71b97a58ea18bb0e813c88377f0d4a45bdb12550a4b25e' 'e46ec0e8e903ca1e21e824c420e237c4fb894047c1bfa6385ebb9b49843237355dfb92ebe57518c8620ab46928cfe0b41c4dc7cacbeb01ef1410495d19fc5f3c' - 'd4165d6e22b5e15e308f197ba1193b9a8724a327622f41af0baf451053b55b0280cddcea96e2d16772d7f055a980336de8459b43687431aacec9d164dc63eb9e') + 'd4165d6e22b5e15e308f197ba1193b9a8724a327622f41af0baf451053b55b0280cddcea96e2d16772d7f055a980336de8459b43687431aacec9d164dc63eb9e' + 'ccf5219017ba1518bc6be6233a115e422e80117fe5ccd466b71996b2e376b7ba3e050cdbc54c8eae623a7d8c118d962ac87b57a4d4851f059f530a0da9bfe973') package() { - cd "$srcdir" - install -d -m 755 "${pkgdir}/var/lib/ubooquity" install -d -m 755 "${pkgdir}/usr/lib/ubooquity" cp -dpr --no-preserve=ownership "${srcdir}/Ubooquity.jar" "${pkgdir}/usr/lib/ubooquity" + install -D -m 644 "${srcdir}/ubooquity.service" "${pkgdir}/usr/lib/systemd/system/ubooquity.service" - install -Dm644 "$srcdir/ubooquity.sysusers" "$pkgdir/usr/lib/sysusers.d/ubooquity.conf" + install -D -m 644 "${srcdir}/ubooquity.sysusers" "${pkgdir}/usr/lib/sysusers.d/ubooquity.conf" + install -D -m 644 "${srcdir}/ubooquity.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/ubooquity.conf" } diff --git a/ubooquity.install b/ubooquity.install deleted file mode 100644 index 355a0ad1ad08..000000000000 --- a/ubooquity.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - systemd-sysusers ubooquity.conf - - mkdir -p /var/lib/ubooquity - chown -R ubooquity:ubooquity /var/lib/ubooquity /usr/lib/ubooquity -} - -post_upgrade() { - post_install $1 -} - diff --git a/ubooquity.tmpfiles b/ubooquity.tmpfiles new file mode 100644 index 000000000000..6b5880466f35 --- /dev/null +++ b/ubooquity.tmpfiles @@ -0,0 +1,3 @@ +d /var/lib/ubooquity 0755 ubooquity ubooquity +Z /var/lib/ubooquity - ubooquity ubooquity +Z /usr/lib/ubooquity - ubooquity ubooquity |