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

[Felix Yan]

    Date: Thursday, June 10, 2021 @ 21:46:12
  Author: felixonmars
Revision: 961797

upgpkg: phonegap 9.0.0-2

Modified:
  phonegap/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-10 21:42:52 UTC (rev 961796)
+++ PKGBUILD	2021-06-10 21:46:12 UTC (rev 961797)
@@ -2,12 +2,12 @@
 
 pkgname=phonegap
 pkgver=9.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="PhoneGap command-line interface and node.js library"
 arch=('x86_64')
 url="https://github.com/phonegap/phonegap-cli"
 license=('Apache')
-depends=('semver' 'cordova')
+depends=('cordova' 'nodejs-nopt' 'semver')
 makedepends=('npm' 'python')
 install=${pkgname}.install
 source=(https://registry.npmjs.org/$pkgname/-/$pkgname-$pkgver.tgz)
@@ -15,7 +15,7 @@
 sha512sums=('072b05307843eb42dfbf1a7c58f0a9dd43eb29ef5ef718e99771e741b78dd10c19d0d5704892b1fd4c1068a09ab8a1f1a7680241283cf31afa1e573aca75dea2')
 
 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.
@@ -29,10 +29,9 @@
   find "$pkgdir" -name "*.pyc" -delete
 
   # Experimental dedup
-  cd "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules
-  for dep in semver cordova; do
-    rm -r $dep;
-  done
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}cordova
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}nopt
+  rm -r "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules/{,.bin/}semver
 }
 
 # vim:set ts=2 sw=2 et: