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

[Felix Yan]

    Date: Tuesday, July 11, 2017 @ 05:45:26
  Author: felixonmars
Revision: 243899

upgpkg: npm 5.2.0-1

Modified:
  npm/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-11 05:45:15 UTC (rev 243898)
+++ PKGBUILD	2017-07-11 05:45:26 UTC (rev 243899)
@@ -2,7 +2,7 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=npm
-pkgver=4.6.1
+pkgver=5.2.0
 pkgrel=1
 pkgdesc='A package manager for javascript'
 arch=('any')
@@ -14,11 +14,11 @@
 optdepends=('python2: for node-gyp')
 options=('!emptydirs')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/npm/npm/archive/v$pkgver.tar.gz")
-sha512sums=('2d2a7c22fa5d31bf63fc2e04d4ac2c4ffd0d9d80055ae40348d994968a47eff26897cbc554bb4de900c54959ae8ce6b89295178ad243c1c7a25730d3f194b0db')
+sha512sums=('b0db06cc6da2bc06955a588b51b490db83ff6bda5211aabbabbaa1221c1d3bae8788e49cc2c06ca894c5b93dc56387509536d858f4dfb9616ecd8160bdbbe099')
 
 prepare() {
   cd npm-$pkgver
-  ln -s /usr/bin/marked{,-man} node_modules/.bin/
+  ln -sf /usr/bin/marked{,-man} node_modules/.bin/
 }
 
 build() {
@@ -30,30 +30,20 @@
   cd npm-$pkgver
   make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
 
-  # Why 777? :/
-  chmod -R u=rwX,go=rX "$pkgdir"
-
-  # Fix files owned by nobody:
-  chown -R root "$pkgdir"/usr/lib/node_modules
-
-  # Fix wrong symlinks
-  for _dir in man1 man5 man7; do
-    mkdir -p "$pkgdir"/usr/share/man/$_dir
-    cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
-    for _file in *; do
-      ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
-    done
-  done
-
   # Provide node-gyp executable
   cp "$pkgdir"/usr/lib/node_modules/npm/bin/node-gyp-bin/node-gyp "$pkgdir"/usr/bin/node-gyp
   sed -i 's|"`dirname "$0"`/../../|"`dirname "$0"`/../lib/node_modules/npm/|' "$pkgdir"/usr/bin/node-gyp
 
+  # Why 777? :/
+  chmod -R u=rwX,go=rX "$pkgdir"
+
   # Experimental dedup
-  cd "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules
-  for dep in semver; do
-    rm -r $dep;
-    node "$srcdir"/npm-$pkgver/cli.js link $dep;
+  for _d in "$pkgdir"/usr/lib/node_modules/$pkgname/node_modules{,/libnpx/node_modules}; do
+    cd "$_d"
+    for dep in semver; do
+      rm -r $dep;
+      node "$srcdir"/npm-$pkgver/bin/npm-cli.js link $dep;
+    done
   done
 
   install -Dm644 "$srcdir"/npm-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE