From d8e314b0a02f24ce76214886351a45d1a17f9603 Mon Sep 17 00:00:00 2001
From: Kevin Sawicki <kevin@github.com>
Date: Mon, 3 Mar 2014 09:40:16 -0800
Subject: [PATCH] Upgrade apm to include bundled node

---
 script/bootstrap           | 9 +++++----
 src/package-manager.coffee | 2 +-
 vendor/apm                 | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/script/bootstrap b/script/bootstrap
index 98beb4eff9b..eee1502e2c2 100755
--- a/script/bootstrap
+++ b/script/bootstrap
@@ -25,6 +25,7 @@ if (!fs.existsSync(apmInstallPath))
 if (!fs.existsSync(path.join(apmInstallPath, 'node_modules')))
   fs.mkdirSync(path.join(apmInstallPath, 'node_modules'));
 
+var apmPath = 'apm/node_modules/atom-package-manager/bin/apm'
 var apmFlags = process.env.JANKY_SHA1 || process.argv.indexOf('--no-color') !== -1 ? '--no-color' : '';
 var packagesToDedupe = ['fs-plus', 'humanize-plus', 'oniguruma', 'roaster', 'season'];
 var echoNewLine = process.platform == 'win32' ? 'echo.' : 'echo';
@@ -35,11 +36,11 @@ var commands = [
   {command: 'npm --strict-ssl=false install --quiet', options: {cwd: apmVendorPath, ignoreStdout: true}},
   {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {cwd: apmInstallPath, ignoreStdout: true}},
   {command: 'npm --strict-ssl=false install --quiet ' + apmVendorPath, options: {ignoreStdout: true}},
-  {command: 'node ../../apm/node_modules/atom-package-manager/bin/apm rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
+  {command: '../../' + apmPath + ' rebuild', options: {cwd: path.resolve('node_modules', 'atom-package-manager'), ignoreStdout: true}},
   echoNewLine,
-  'node apm/node_modules/atom-package-manager/bin/apm clean ' + apmFlags,
-  'node apm/node_modules/atom-package-manager/bin/apm install --quiet ' + apmFlags,
-  'node apm/node_modules/atom-package-manager/bin/apm dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
+  apmPath + ' clean ' + apmFlags,
+  apmPath + ' install --quiet ' + apmFlags,
+  apmPath + ' dedupe --quiet ' + apmFlags + ' ' + packagesToDedupe.join(' '),
 ];
 
 process.chdir(path.dirname(__dirname));
diff --git a/src/package-manager.coffee b/src/package-manager.coffee
index 2ace669b6ca..b25df19b771 100644
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
@@ -41,7 +41,7 @@ class PackageManager
 
   # Public: Get the path to the apm command
   getApmPath: ->
-    @apmPath ?= require.resolve('atom-package-manager/bin/apm')
+    @apmPath ?= require.resolve('atom-package-manager/lib/cli')
 
   # Public: Get the paths being used to look for packages.
   #
diff --git a/vendor/apm b/vendor/apm
index 90cd546860e..abdb723c4f8 160000
--- a/vendor/apm
+++ b/vendor/apm
@@ -1 +1 @@
-Subproject commit 90cd546860e9782ac8d0d5f7a35ab49d5d105a4e
+Subproject commit abdb723c4f81c9a6a1f2f9966bf207cda6d4ba0d