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

[Nicola Squartini]

    Date: Saturday, March 4, 2017 @ 18:16:41
  Author: tensor5
Revision: 214912

upgpkg: apm 1.16.0-1

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

----------------------+
 PKGBUILD             |   15 ++++++++-------
 apm.js               |    2 ++
 use-system-npm.patch |   18 +++++++++---------
 3 files changed, 19 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-04 17:56:44 UTC (rev 214911)
+++ PKGBUILD	2017-03-04 18:16:41 UTC (rev 214912)
@@ -2,7 +2,7 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 pkgname=apm
-pkgver=1.15.2
+pkgver=1.16.0
 pkgrel=1
 pkgdesc='Atom package manager'
 arch=('i686' 'x86_64')
@@ -18,10 +18,10 @@
         'apm.js'
         'no-scripts.patch'
         'use-system-npm.patch')
-sha256sums=('54f9ce52f10515e810c5580690e7d3a661646268b91a0de377b5e7f6e92aa3e1'
-            '0eb50358109c7acb4f750ce278323c1d5b86baea5841d5166cf4342a3edf2898'
+sha256sums=('5d02e5f148b86e462ae1f62443f682bbddaba1ee1c2ecc77714b4df240fad0df'
+            '4ae1e5388ec2c52d8893d56a8df816e8aa69f54690801a9d283771133b4b3752'
             '0f61369526d013b001f116b0fbbfd8564377c56962057135d2633e84d31a1562'
-            'c6bf548e5850d9699b4bf662eee33aca628c62ab9c92f9216e8fe33b0012990c')
+            '78307044359a56d019dada17c92fe769e57d9bbe3f5eaa5f6e7550827cbfe802')
 
 _apmdir='/usr/lib/node_modules/atom-package-manager'
 
@@ -35,12 +35,12 @@
   rm src/cli.coffee
   install -m755 "${srcdir}"/apm.js bin/apm
 
+  # Use system npm
+  patch -Np1 -i "${srcdir}"/use-system-npm.patch
+
   # Don't download binary Node
   patch -Np1 -i "${srcdir}"/no-scripts.patch
   rm BUNDLED_NODE_VERSION script/*
-
-  # Use system npm
-  patch -Np1 -i "${srcdir}"/use-system-npm.patch
 }
 
 build() {
@@ -90,6 +90,7 @@
       -or -name "man" -prune -exec rm -r '{}' \; \
       -or -name "obj.target" -prune -exec rm -r '{}' \; \
       -or -name "samples" -prune -exec rm -r '{}' \; \
+      -or -name "scripts" -prune -exec rm -r '{}' \; \
       -or -name "test" -prune -exec rm -r '{}' \; \
       -or -name "tests" -prune -exec rm -r '{}' \;
 }

Modified: apm.js
===================================================================
--- apm.js	2017-03-04 17:56:44 UTC (rev 214911)
+++ apm.js	2017-03-04 18:16:41 UTC (rev 214912)
@@ -9,6 +9,8 @@
         require('fs')
     .readFileSync('/usr/lib/electron/version', 'utf8').trim().slice(1);
 
+process.env.PYTHON = __dirname + "/python-interceptor.sh";
+
 require('../lib/apm-cli.js').run(process.argv.slice(2), function (error) {
     process.exitCode = +!!error;
 });

Modified: use-system-npm.patch
===================================================================
--- use-system-npm.patch	2017-03-04 17:56:44 UTC (rev 214911)
+++ use-system-npm.patch	2017-03-04 18:16:41 UTC (rev 214912)
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -25,7 +25,6 @@
+@@ -32,7 +32,6 @@
      "keytar": "^3.0",
      "mv": "2.0.0",
      "ncp": "~0.5.1",
@@ -21,12 +21,12 @@
      options = yargs(argv).wrap(100)
 --- a/src/install.coffee
 +++ b/src/install.coffee
-@@ -26,7 +26,7 @@
-     @atomPackagesDirectory = path.join(@atomDirectory, 'packages')
-     @atomNodeDirectory = path.join(@atomDirectory, '.node-gyp')
-     @atomNpmPath = require.resolve('npm/bin/npm-cli')
--    @atomNodeGypPath = require.resolve('node-gyp/bin/node-gyp')
-+    @atomNodeGypPath = require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
+@@ -84,7 +84,7 @@
+     opts = {env, cwd: @atomDirectory}
+     opts.streaming = true if @verbose
  
-   parseOptions: (argv) ->
-     options = yargs(argv).wrap(100)
+-    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('node-gyp/bin/node-gyp')
++    atomNodeGypPath = process.env.ATOM_NODE_GYP_PATH or require.resolve('npm/node_modules/node-gyp/bin/node-gyp')
+     @fork atomNodeGypPath, installNodeArgs, opts, (code, stderr='', stdout='') ->
+       if code is 0
+         callback()