Bump to v3.0.4

Thanks to @VannTen for patch

2 files changed, 38 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3319a356af1..ca665cf70e30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = nodejs-resume-cli
 	pkgdesc = The command line tool for JSON Resume
-	pkgver = 1.2.7
+	pkgver = 3.0.4
 	pkgrel = 1
 	url = https://github.com/jsonresume/resume-cli
 	arch = any
 	license = MIT
+	makedepends = npm
+	makedepends = jq
 	depends = nodejs
-	depends = npm
-	noextract = resume-cli-1.2.7.tgz
-	source = https://registry.npmjs.org/resume-cli/-/resume-cli-1.2.7.tgz
-	sha256sums = a84f2739ca1d2ee5d9ca113ae9a9a7ee9d90808f9bffbade8e72c12eb2552958
+	noextract = nodejs-resume-cli-3.0.4.tgz
+	source = https://registry.npmjs.org/nodejs-resume-cli/-/nodejs-resume-cli-3.0.4.tgz
+	sha512sums = 1274d5e87a343cd2e40279034d57f771cfc8580a1f3c71df03b0ac080edc12126ad939b4540ab9120d4c2cd86aa2a47cb44ee56b2072a64090997c9e6f56c8ea
 
 pkgname = nodejs-resume-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c63fb8ea22e..0f7da9713a11 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,41 @@
-_npmname=resume-cli
-_npmver=1.2.7
+# Maintainer: matoro <matoro at airmail.cc>
+# Contributor: Max Gautier <mg+archlinux@max.gautier.name>
+
 pkgname=nodejs-resume-cli
-pkgver="${_npmver}"
+pkgver=3.0.4
 pkgrel=1
 pkgdesc="The command line tool for JSON Resume"
 arch=(any)
 url="https://github.com/jsonresume/resume-cli"
 license=('MIT')
-depends=('nodejs' 'npm')
-source=("https://registry.npmjs.org/${_npmname}/-/${_npmname}-${_npmver}.tgz")
-noextract=(${_npmname}-${_npmver}.tgz)
-sha256sums=('a84f2739ca1d2ee5d9ca113ae9a9a7ee9d90808f9bffbade8e72c12eb2552958')
+depends=('nodejs')
+makedepends=('npm' 'jq')
+source=("https://registry.npmjs.org/${pkgname}/-/${pkgname}-${pkgver}.tgz")
+noextract=(${pkgname}-${pkgver}.tgz)
+sha512sums=('1274d5e87a343cd2e40279034d57f771cfc8580a1f3c71df03b0ac080edc12126ad939b4540ab9120d4c2cd86aa2a47cb44ee56b2072a64090997c9e6f56c8ea')
 
 package() {
-    cd ${srcdir}
-    local _npmdir="${pkgdir}/usr/lib/node_modules/"
-    mkdir -p ${_npmdir}
-    cd ${_npmdir}
-    npm install -g --prefix "${pkgdir}/usr" ${_npmname}@${_npmver}
-}
+   npm install -g --user root --prefix "$pkgdir/usr" "$srcdir/$pkgname-$pkgver.tgz"
+
+
+   # Non-deterministic race in npm gives 777 permissions to random directories.
+   # See https://github.com/npm/cli/issues/1103 for details.
+   find "$pkgdir/usr" -type d -exec chmod 755 {} +
 
-# vim:set ts=2 sw=2 et:
+   # Remove references to $pkgdir
+   find "$pkgdir" -type f -name package.json -exec sed -i "/_where/d" {} +
+
+   # Remove references to $srcdir
+   local tmppackage="$(mktemp)"
+   local pkgjson="$pkgdir/usr/lib/node_modules/$pkgname/package.json"
+   jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+   mv "$tmppackage" "$pkgjson"
+   chmod 644 "$pkgjson"
+
+   find "$pkgdir" -type f -name package.json | while read pkgjson; do
+       local tmppackage="$(mktemp)"
+       jq 'del(.man)' "$pkgjson" > "$tmppackage"
+       mv "$tmppackage" "$pkgjson"
+       chmod 644 "$pkgjson"
+   done
+}