Update to 0.12.0

2 files changed, 29 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1a717f1e800d..49738b0c5442 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 pkgbase = nodejs-xml2json
 	pkgdesc = Converts XML to JSON using node-expat
-	pkgver = 0.11.2
+	pkgver = 0.12.0
 	pkgrel = 1
-	url = https://github.com/buglabs/node-xml2json
+	url = https://www.npmjs.com/package/xml2json
 	arch = any
-	makedepends = jq
 	makedepends = npm
+	makedepends = jq
 	depends = nodejs
-	source = http://registry.npmjs.org/xml2json/-/xml2json-0.11.2.tgz
-	sha1sums = 70ddd234fd7818312cc58455cab8457b5bcc7c52
+	noextract = xml2json-0.12.0.tgz
+	source = https://registry.npmjs.org/xml2json/-/xml2json-0.12.0.tgz
+	sha256sums = f5894a8ddffaf9fb5d47b1155d66034c68b6f112e93daad9f0b8add071537d83
 
 pkgname = nodejs-xml2json
-
diff --git a/PKGBUILD b/PKGBUILD
index 9df4b234e5e3..8dd6f0f5966d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,37 @@
 # Maintainer: Drew Noel <drewmnoel@gmail.com>
-_npmname=xml2json
-_npmver=0.11.2
-pkgname=nodejs-xml2json
-pkgver=0.11.2
+_pkgname=xml2json
+pkgname="nodejs-$_pkgname"
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="Converts XML to JSON using node-expat"
 arch=(any)
-url="https://github.com/buglabs/node-xml2json"
+url="https://www.npmjs.com/package/$_pkgname"
 license=()
 depends=('nodejs')
-makedepends=('jq' 'npm')
-optdepends=()
-source=(http://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz)
-sha1sums=('70ddd234fd7818312cc58455cab8457b5bcc7c52')
+makedepends=('npm' 'jq')
+source=("https://registry.npmjs.org/$_pkgname/-/$_pkgname-$pkgver.tgz")
+noextract=("$_pkgname-$pkgver.tgz")
+sha256sums=('f5894a8ddffaf9fb5d47b1155d66034c68b6f112e93daad9f0b8add071537d83')
 
 package() {
-    # 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"
+	npm install -g --prefix "$pkgdir/usr" "$srcdir/$_pkgname-$pkgver.tgz"
 
-    # Fix permissions
-    find "$pkgdir"/usr -type d -exec chmod 755 {} +
+	# Remove references to pkgdir
+	find "$pkgdir" -type f -name package.json -print0 | xargs -0 sed -i "/_where/d"
 
-    # 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/$_pkgname/package.json"
+	jq '.|=with_entries(select(.key|test("_.+")|not))' "$pkgjson" > "$tmppackage"
+	mv "$tmppackage" "$pkgjson"
+	chmod 644 "$pkgjson"
 
-    # 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"
+	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
 }
 
 # vim:set ts=2 sw=2 et: