upgpkg: nodejs-npm2arch 2.0.0-2

Fix source

2 files changed, 11 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3212ab864726..2be63a4d2981 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = nodejs-npm2arch
 	pkgdesc = Convert NPM package to a PKGBUILD for ArchLinux
 	pkgver = 2.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/simon04/npm2arch
 	arch = any
 	license = MIT
 	depends = nodejs
 	depends = npm
-	noextract = npm2arch-1.0.0.tgz
-	source = https://registry.npmjs.org/@simon04/npm2arch/-/npm2arch-1.0.0.tgz
-	sha1sums = e53348f74f661b3430f94011a3d597fb0db80741
+	noextract = npm2arch-2.0.0.tgz
+	source = https://registry.npmjs.org/@simon04/npm2arch/-/npm2arch-2.0.0.tgz
+	sha1sums = 1c200b71fe6dc68d63cebf0749ee7c34f1f91d9b
 
 pkgname = nodejs-npm2arch
 
diff --git a/PKGBUILD b/PKGBUILD
index c85673bcf22c..480c717f86ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,39 +1,26 @@
 _npmnamespace=@simon04
 _npmname=npm2arch
-_npmver=1.0.0
 pkgname=nodejs-npm2arch
 pkgver=2.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/$_npmnamespace/$_npmname/-/$_npmname-$_npmver.tgz)
-noextract=($_npmname-$_npmver.tgz)
-sha1sums=('e53348f74f661b3430f94011a3d597fb0db80741')
+source=(https://registry.npmjs.org/$_npmnamespace/$_npmname/-/$_npmname-$pkgver.tgz)
+noextract=($_npmname-$pkgver.tgz)
+sha1sums=('1c200b71fe6dc68d63cebf0749ee7c34f1f91d9b')
 
 package() {
   cd $srcdir
   local _npmdir="$pkgdir/usr/lib/node_modules/"
   mkdir -p $_npmdir
   cd $_npmdir
-  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'
+  npm install -g --prefix "$pkgdir/usr" $_npmnamespace/$_npmname@$pkgver
+  find "${pkgdir}"/usr -name package.json -exec sed -i '/"_where"/d' '{}' '+'
+  find "${pkgdir}"/usr -type d -exec chmod 755 {} +
 }
 
 # vim:set ts=2 sw=2 et: