[arch-commits] Commit in cordova/trunk (PKGBUILD)

[Felix Yan]

    Date: Thursday, June 10, 2021 @ 21:42:38
  Author: felixonmars
Revision: 961795

upgpkg: cordova 10.0.0-2

Modified:
  cordova/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-10 21:42:01 UTC (rev 961794)
+++ PKGBUILD	2021-06-10 21:42:38 UTC (rev 961795)
@@ -2,12 +2,12 @@
 
 pkgname=cordova
 pkgver=10.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Cordova command line interface tool'
 arch=('any')
 url='https://cordova.apache.org'
 license=('Apache')
-depends=('npm' 'semver')
+depends=('node-gyp' 'nodejs-nopt' 'npm' 'semver')
 install=cordova.install
 source=("https://registry.npmjs.org/$pkgname/-/$pkgname-$pkgver.tgz")
 noextract=("$pkgname-$pkgver.tgz")
@@ -14,7 +14,7 @@
 sha512sums=('d34c0c723dd7f482e12adbd11b6884c0edaa972e01faf8171611f85a155ea568365156c3d68a65d6af63499fa3d80688fefb01596f1ee8cd8ce450076ac9ee5b')
 
 package() {
-  npm install -g --user root --prefix "$pkgdir"/usr "$srcdir"/$pkgname-$pkgver.tgz
+  npm install -g --prefix "$pkgdir"/usr "$srcdir"/$pkgname-$pkgver.tgz
 
   # Non-deterministic race in npm gives 777 permissions to random directories.
   # See https://github.com/npm/npm/issues/9359 for details.
@@ -28,8 +28,7 @@
   find "$pkgdir" -name "*.pyc" -delete
 
   # Experimental dedup
-  cd "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules
-  for dep in semver; do
-    rm -r $dep;
-  done
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}node-gyp
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}nopt
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}semver
 }