[arch-commits] Commit in apm/trunk (PKGBUILD use-system-npm.patch)

[Nicola Squartini]

    Date: Wednesday, May 15, 2019 @ 02:13:51
  Author: tensor5
Revision: 467248

upgpkg: apm 2.2.3-2

Fix node-gyp path.

Modified:
  apm/trunk/PKGBUILD
  apm/trunk/use-system-npm.patch

----------------------+
 PKGBUILD             |    4 ++--
 use-system-npm.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-15 01:41:05 UTC (rev 467247)
+++ PKGBUILD	2019-05-15 02:13:51 UTC (rev 467248)
@@ -2,7 +2,7 @@
 
 pkgname=apm
 pkgver=2.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Atom package manager'
 arch=('x86_64')
 url='https://github.com/atom/apm'
@@ -22,7 +22,7 @@
             '05702e86aa2287b553c230557c5f84ea54dd6ed3cc49763edba4239b0ab99373'
             '897a82cd23ed5a4f226635dabe56ad28e533cb0949593e2b771ad7928c058bcb'
             '621ae29f99c3fbc410a9a7dc143dd9c912ee94eaa48110ad32c40647f635e792'
-            'cf17bd31f70079fe2a17958712c1a515ce83623dd3f97557a3f01d346da09f19')
+            'b5060321f0c2d391efb742393dc0af564977ded5fc30b78d9fd895e384f6ef6d')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
 

Modified: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2019-05-15 01:41:05 UTC (rev 467247)
+++ use-system-npm.patch	2019-05-15 02:13:51 UTC (rev 467248)
@@ -8,3 +8,36 @@
      "open": "0.0.5",
      "q": "~0.9.7",
      "read": "~1.0.5",
+--- a/src/ci.coffee
++++ b/src/ci.coffee
+@@ -16,7 +16,7 @@
+     @atomDirectory = config.getAtomDirectory()
+     @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp')
+     @atomNpmPath = require.resolve('npm/bin/npm-cli')
+-    @atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
++    @atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp')
+ 
+   parseOptions: (argv) ->
+     options = yargs(argv).wrap(100)
+--- a/src/dedupe.coffee
++++ b/src/dedupe.coffee
+@@ -18,7 +18,7 @@
+     @atomPackagesDirectory = path.join(@atomDirectory, 'packages')
+     @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp')
+     @atomNpmPath = require.resolve('npm/bin/npm-cli')
+-    @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
++    @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp')
+ 
+   parseOptions: (argv) ->
+     options = yargs(argv).wrap(100)
+--- a/src/install.coffee
++++ b/src/install.coffee
+@@ -83,7 +83,7 @@
+     opts = {env, cwd: @atomDirectory}
+     opts.streaming = true if @verbose
+ 
+-    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
++    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp')
+     @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') ->
+       if code is 0
+         callback()