2.0.1-3

5 files changed, 25 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3456197ed7d..19d9e5e80e12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,20 @@
 pkgbase = memry
 	pkgdesc = mem'ry, tar pipe curl
 	pkgver = 2.0.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/kpcyrd/memry
-	install = memry.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	makedepends = npm
+	makedepends = python2
 	depends = nodejs
 	source = https://registry.npmjs.org/memry/-/memry-2.0.1.tgz
+	source = memry-sysuser.conf
+	source = memry-tmpfiles.conf
 	sha512sums = fccc5c284ea4134a204069218795346e0888a780dae6af72ee3add51c84649c8945860d0cbeabf18ab68f40abfb2eb440a169398299420f73d692a3f1d8d619c
+	sha512sums = 6512005ed2cbbdd77dabf7e5562ac91159c487dcb8ef26bfc94595e232c5e261ae1851b40ceb4d63d60ae95a88cbe061a7946d3f7bf5c2b9aecff3e6b6d575ec
+	sha512sums = c79d3e954cba6d4041b097dc46134db68eb105e24846d3e229350ec7126f4b778e6983a5835ab8f2b5140642eb40e269ad93ec35d745795c589c647cd68cb01a
 
 pkgname = memry
 
diff --git a/PKGBUILD b/PKGBUILD
index 99b3ed57dfe9..18033b8d095b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,33 @@
 
 pkgname=memry
 pkgver=2.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="mem'ry, tar pipe curl"
 url='https://github.com/kpcyrd/memry'
 arch=('i686' 'x86_64')
 license=('GPL3')
 depends=('nodejs')
-makedepends=('npm')
-install='memry.install'
-source=(https://registry.npmjs.org/$pkgname/-/$pkgname-$pkgver.tgz)
-sha512sums=('fccc5c284ea4134a204069218795346e0888a780dae6af72ee3add51c84649c8945860d0cbeabf18ab68f40abfb2eb440a169398299420f73d692a3f1d8d619c')
+makedepends=('npm' 'python2')
+source=("https://registry.npmjs.org/$pkgname/-/$pkgname-$pkgver.tgz"
+        "memry-sysuser.conf"
+        "memry-tmpfiles.conf")
+sha512sums=('fccc5c284ea4134a204069218795346e0888a780dae6af72ee3add51c84649c8945860d0cbeabf18ab68f40abfb2eb440a169398299420f73d692a3f1d8d619c'
+            '6512005ed2cbbdd77dabf7e5562ac91159c487dcb8ef26bfc94595e232c5e261ae1851b40ceb4d63d60ae95a88cbe061a7946d3f7bf5c2b9aecff3e6b6d575ec'
+            'c79d3e954cba6d4041b097dc46134db68eb105e24846d3e229350ec7126f4b778e6983a5835ab8f2b5140642eb40e269ad93ec35d745795c589c647cd68cb01a')
 
 package() {
-    npm install -g --user root --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}-${pkgver}.tgz"
-    node-gyp rebuild -C "${pkgdir}/usr/lib/node_modules/${pkgname}/node_modules/scrypt"
-    rm -r "${pkgdir}/usr/etc"
+  npm install -g --user root --prefix "${pkgdir}/usr" "${srcdir}/${pkgname}-${pkgver}.tgz"
+  node-gyp rebuild -C "${pkgdir}/usr/lib/node_modules/${pkgname}/node_modules/scrypt"
+  rm -r "${pkgdir}/usr/etc"
 
-    install -dm0750 -o 337 -g 337 "${pkgdir}"/var/lib/memry/{,storage/}
+  install -Dm644 package/contrib/${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm644 memry-sysuser.conf "${pkgdir}/usr/lib/sysusers.d/memry.conf"
+  install -Dm644 memry-tmpfiles.conf "${pkgdir}/usr/lib/tmpfiles.d/memry.conf"
 
-    install -d "${pkgdir}/usr/share/licenses/${pkgname}"
-    ln -s ../../../lib/node_modules/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  ln -s ../../../lib/node_modules/${pkgname}/LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
-    install -Dm 644 package/contrib/${pkgname}.service "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
-    install -Dm 644 package/contrib/${pkgname}.1 "${pkgdir}/usr/share/man/man1/${pkgname}.1"
+  install -Dm644 package/contrib/${pkgname}.1 "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/memry-sysuser.conf b/memry-sysuser.conf
new file mode 100644
index 000000000000..4ebf001043b3
--- /dev/null
+++ b/memry-sysuser.conf
@@ -0,0 +1 @@
+u memry - "memry daemon user"
diff --git a/memry-tmpfiles.conf b/memry-tmpfiles.conf
new file mode 100644
index 000000000000..ec1a321e0770
--- /dev/null
+++ b/memry-tmpfiles.conf
@@ -0,0 +1 @@
+q /var/lib/memry/storage    0750 memry memry -
diff --git a/memry.install b/memry.install
deleted file mode 100644
index 55710561adf7..000000000000
--- a/memry.install
+++ /dev/null
@@ -1,4 +0,0 @@
-post_install() {
-    getent group memry &> /dev/null || groupadd -g 337 memry &>/dev/null
-    getent passwd memry &> /dev/null || useradd -u 337 -g memry -d /var/lib/memry -s /bin/nologin memry &> /dev/null
-}