upgpkg: nodejs-npm2arch 1.0.0-2

upgpkg: nodejs-npm2arch 1.0.0-2

Fix source URL, remove bundled npm, fix node.js package issues

2 files changed, 23 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5d3b9221bd5..a464b207d670 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
-# Generated by mksrcinfo v8
-# Mon Mar 12 08:58:10 UTC 2018
 pkgbase = nodejs-npm2arch
 	pkgdesc = Convert NPM package to a PKGBUILD for ArchLinux
 	pkgver = 1.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/simon04/npm2arch
 	arch = any
 	license = MIT
 	depends = nodejs
 	depends = npm
-	noextract = @simon04/npm2arch-1.0.0.tgz
-	source = https://registry.npmjs.org/@simon04/npm2arch/-/@simon04/npm2arch-1.0.0.tgz
+	noextract = npm2arch-1.0.0.tgz
+	source = https://registry.npmjs.org/@simon04/npm2arch/-/npm2arch-1.0.0.tgz
 	sha1sums = e53348f74f661b3430f94011a3d597fb0db80741
 
 pkgname = nodejs-npm2arch
diff --git a/PKGBUILD b/PKGBUILD
index 257ed0e44d61..12bb03c38e22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,16 @@
-_npmname=@simon04/npm2arch
+_npmnamespace=@simon04
+_npmname=npm2arch
 _npmver=1.0.0
-pkgname=nodejs-npm2arch # All lowercase
+pkgname=nodejs-npm2arch
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Convert NPM package to a PKGBUILD for ArchLinux"
 arch=(any)
 url="https://github.com/simon04/npm2arch"
 license=(MIT)
 depends=('nodejs' 'npm')
 optdepends=()
-source=(https://registry.npmjs.org/$_npmname/-/$_npmname-$_npmver.tgz)
+source=(https://registry.npmjs.org/$_npmnamespace/$_npmname/-/$_npmname-$_npmver.tgz)
 noextract=($_npmname-$_npmver.tgz)
 sha1sums=(e53348f74f661b3430f94011a3d597fb0db80741)
 
@@ -18,8 +19,21 @@ package() {
   local _npmdir="$pkgdir/usr/lib/node_modules/"
   mkdir -p $_npmdir
   cd $_npmdir
-  npm install -g --prefix "$pkgdir/usr" $_npmname@$_npmver
-  sed -i '/"_where":/d' "$_npmname/package.json"
+  npm install -g --prefix "$pkgdir/usr" $_npmnamespace/$_npmname@$_npmver
+
+  # npm is in depends
+  rm -r "$pkgdir/usr/lib/node_modules/@simon04/npm2arch/node_modules/npm"
+
+  # Non-deterministic race in npm gives 777 permissions to random directories.
+  # See https://github.com/npm/npm/issues/9359 for details.
+
+  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}"
+
+  # Fix "Package contains reference to $srcdir/$pkgdir"
+  find "$pkgdir" -name package.json -print0 | xargs -r -0 sed -i '/_where/d'
 }
 
 # vim:set ts=2 sw=2 et: