summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoliathLabs2020-06-15 13:38:41 +0200
committerGoliathLabs2020-06-15 13:38:41 +0200
commit79668619409309f9b172c97184e4ad6db4aee1e9 (patch)
tree260baef8c9c1cd1efd6457d8a9e56103cf6d8456
parent4f8bd3fc79810973f6bedee186fdf1044c3b1a50 (diff)
downloadaur-79668619409309f9b172c97184e4ad6db4aee1e9.tar.gz
Updated: 3.2.1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD36
2 files changed, 29 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cecf49b877f5..894197441b66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = nodejs-winston
pkgdesc = A multi-transport async logging library for Node.js
- pkgver = 0.9.0
+ pkgver = 3.2.1
pkgrel = 1
url = https://github.com/flatiron/winston
arch = any
license = MIT
depends = nodejs
- noextract = winston-0.9.0.tgz
- source = http://registry.npmjs.org/winston/-/winston-0.9.0.tgz
- sha1sums = b5726e6c42291e305e36286ce7ae9f3b74a527a8
+ noextract = winston-3.2.1.tgz
+ source = http://registry.npmjs.org/winston/-/winston-3.2.1.tgz
+ sha256sums = 85b9340c1b3c4b2b96925fb7589c053ef74f617a847f4d5b0da658af68c53ce7
pkgname = nodejs-winston
diff --git a/PKGBUILD b/PKGBUILD
index 98e75f6f518f..306d0fb8550e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Daniel Nagy <danielnagy at gmx de>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Daniel Nagy <danielnagy at gmx de>
# Contributor: Nodejitsu Inc. <info@nodejitsu.com>
# Contributor: indexzero <charlie.robbins@gmail.com>
# Contributor: mmalecki <me@mmalecki.com>
@@ -6,9 +7,8 @@
# Contributor: V1 <info@3rd-Eden.com>
_npmname=winston
-_npmver=0.9.0
pkgname=nodejs-winston # All lowercase
-pkgver=0.9.0
+pkgver=3.2.1
pkgrel=1
pkgdesc="A multi-transport async logging library for Node.js"
arch=(any)
@@ -16,16 +16,30 @@ url="https://github.com/flatiron/winston"
license=("MIT")
depends=('nodejs' )
optdepends=()
-source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz)
-noextract=($_npmname-$_npmver.tgz)
-sha1sums=('b5726e6c42291e305e36286ce7ae9f3b74a527a8')
+source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$pkgver.tgz)
+noextract=($_npmname-$pkgver.tgz)
+sha256sums=('85b9340c1b3c4b2b96925fb7589c053ef74f617a847f4d5b0da658af68c53ce7')
package() {
- cd "$srcdir"
- local _npmdir="$pkgdir/usr/lib/node_modules/"
- mkdir -p "$_npmdir"
- cd "$_npmdir"
- npm install -g --prefix "$pkgdir/usr" $_npmname@$_npmver
+ # 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"
}
# vim:set ts=2 sw=2 et: