summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD39
2 files changed, 34 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a39874f9ad1..c5196537926 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
# Generated by mksrcinfo v8
-# Sun Jun 14 20:53:04 UTC 2020
+# Mon Jun 15 15:01:14 UTC 2020
pkgbase = nodejs-redis-commander
- pkgdesc = Redis web-based management tool written in node.js
+ pkgdesc = Redis management tool written in node.js
pkgver = 0.7.0
- pkgrel = 1
- url = http://joeferner.github.io/redis-commander/
+ pkgrel = 2
+ url = https://joeferner.github.io/redis-commander/
arch = any
license = MIT
depends = nodejs
noextract = redis-commander-0.7.0.tgz
- source = http://registry.npmjs.org/redis-commander/-/redis-commander-0.7.0.tgz
- sha1sums = 389a9e6239adf5f37fdd628e9968ce3f3b3cd3b2
+ source = https://registry.npmjs.org/redis-commander/-/redis-commander-0.7.0.tgz
+ sha256sums = 12bad786d94793d0b54886e427acd8591f2f762a9b3e78560347c310fb11945f
pkgname = nodejs-redis-commander
diff --git a/PKGBUILD b/PKGBUILD
index e7e9cf8475c..365526c6985 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,38 @@
-# Contributor: Bruno Galeotti <bgaleotti at gmail dot com>
+# Maintainer: Bruno Galeotti <bgaleotti at gmail dot com>
+# Contributor: Felix Golatofski <contact@xdfr.de>
+
_npmname=redis-commander
pkgname=nodejs-redis-commander
pkgver=0.7.0
-pkgrel=1
-pkgdesc="Redis web-based management tool written in node.js"
+pkgrel=2
+pkgdesc="Redis management tool written in node.js"
arch=('any')
-url="http://joeferner.github.io/redis-commander/"
+url="https://joeferner.github.io/redis-commander/"
depends=('nodejs')
license=('MIT')
-source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
+source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
noextract=($_npmname-$pkgver.tgz)
+sha256sums=('12bad786d94793d0b54886e427acd8591f2f762a9b3e78560347c310fb11945f')
+
package() {
- cd $srcdir
- local _npmdir="$pkgdir/usr/lib/node_modules/"
- mkdir -p $_npmdir
- cd $_npmdir
- npm install -g --prefix "$pkgdir/usr" $_npmname@$pkgver
+ # Thanks jeremejevs and je-vv for the pointers on these!
+ npm install -g --user root --cache "${srcdir}/npm-cache" --prefix "$pkgdir/usr" "$srcdir/$_npmname-$pkgver.tgz"
+
+ # Fix permissions
+ find "$pkgdir"/usr -type d -exec chmod 755 {} +
+
+ # npm gives ownership of ALL FILES to build user
+ # https://bugs.archlinux.org/task/63396
+ chown -R root:root "${pkgdir}"
+
+ # Remove references to pkgdir
+ find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
+
+ # Remove references to srcdir
+ local tmppackage="$(mktemp)"
+ local pkgjson="$pkgdir/usr/lib/node_modules/$_npmname/package.json"
+ jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+ mv "$tmppackage" "$pkgjson"
+ chmod 644 "$pkgjson"
}
-sha1sums=('389a9e6239adf5f37fdd628e9968ce3f3b3cd3b2')
# vim:set ts=2 sw=2 et: