[wip] Improve Python 2 detection

.gitignore

@@ -5,3 +5,4 @@
 npm-debug.log
 *~
 *.pyc
+.python2-bin

bin/python-interceptor.sh

@@ -34,9 +34,9 @@ case $1 in
       ARGS+=("--format=safemake.py")
     fi
 
-    exec python "${ARGS[@]}"
+    exec "${ATOM_APM_ORIGINAL_PYTHON:-python}" "${ARGS[@]}"
     ;;
   *)
-    exec python "$@"
+    exec "${ATOM_APM_ORIGINAL_PYTHON:-python}" "$@"
     ;;
 esac

package.json

@@ -22,6 +22,7 @@
     "check-version": "node version.js"
   },
   "dependencies": {
+    "@atom/dowsing-rod": "^1.1.0",
     "asar-require": "0.3.0",
     "async": "~0.2.8",
     "colors": "~0.6.1",
@@ -32,8 +33,8 @@
     "keytar": "^4.0",
     "mv": "2.0.0",
     "ncp": "~0.5.1",
-    "npm": "3.10.10",
     "node-gyp": "3.4.0",
+    "npm": "3.10.10",
     "open": "0.0.4",
     "plist": "git+https://github.com/nathansobo/node-plist.git",
     "q": "~0.9.7",

script/postinstall.js

@@ -10,3 +10,10 @@ if (process.platform.indexOf('win') === 0) {
 var child = cp.spawn(script, [], { stdio: ['pipe', 'pipe', 'pipe'], shell: true })
 child.stderr.pipe(process.stderr)
 child.stdout.pipe(process.stdout)
+child.on('error', err => {
+  console.error(err)
+  process.exit(1)
+})
+child.on('exit', code => {
+  process.exit(code !== null ? code : 1)
+})

src/dedupe.coffee

@@ -31,6 +31,12 @@ class Dedupe extends Command
     """
     options.alias('h', 'help').describe('help', 'Print this usage message')
 
+  setPythonEnv: (callback) ->
+    options =
+      npmBin: require.resolve('npm/bin/npm-cli')
+      pythonBinFile: path.join(@atomDirectory, 'python2bin')
+    dowsingRod.setPythonEnv(options, process.env).then(callback)
+
   installNode: (callback) ->
     installNodeArgs = ['install']
     installNodeArgs.push("--runtime=electron")
@@ -54,11 +60,12 @@ class Dedupe extends Command
       proxy = npm.config.get('https-proxy') or npm.config.get('proxy') or env.HTTPS_PROXY or env.HTTP_PROXY
       installNodeArgs.push("--proxy=#{proxy}") if proxy
 
-      @fork @atomNodeGypPath, installNodeArgs, {env, cwd: @atomDirectory}, (code, stderr='', stdout='') ->
-        if code is 0
-          callback()
-        else
-          callback("#{stdout}\n#{stderr}")
+      @setPythonEnv =>
+        @fork @atomNodeGypPath, installNodeArgs, {env, cwd: @atomDirectory}, (code, stderr='', stdout='') ->
+          if code is 0
+            callback()
+          else
+            callback("#{stdout}\n#{stderr}")
 
   getVisualStudioFlags: ->
     if vsVersion = config.getInstalledVisualStudioFlag()

src/install.coffee

@@ -9,6 +9,7 @@ Git = require 'git-utils'
 semver = require 'semver'
 temp = require 'temp'
 hostedGitInfo = require 'hosted-git-info'
+dowsingRod = require '@atom/dowsing-rod'
 
 config = require './apm'
 Command = require './command'
@@ -607,6 +608,12 @@ class Install extends Command
     catch err
       callback(err)
 
+  setPythonEnv: (callback) ->
+    options =
+      npmBin: require.resolve('npm/bin/npm-cli')
+      pythonBinFile: path.join(@atomDirectory, 'python2bin')
+    dowsingRod.setPythonEnv(options, process.env).then(callback)
+
   run: (options) ->
     {callback} = options
     options = @parseOptions(options.commandArgs)
@@ -616,8 +623,9 @@ class Install extends Command
 
     if options.argv.check
       config.loadNpm (error, @npm) =>
-        @loadInstalledAtomMetadata =>
-          @checkNativeBuildTools(callback)
+        @setPythonEnv =>
+          @loadInstalledAtomMetadata =>
+            @checkNativeBuildTools(callback)
       return
 
     @verbose = options.argv.verbose
@@ -658,6 +666,7 @@ class Install extends Command
 
     commands = []
     commands.push (callback) => config.loadNpm (error, @npm) => callback(error)
+    commands.push (callback) => @setPythonEnv -> callback()
     commands.push (callback) => @loadInstalledAtomMetadata -> callback()
     packageNames.forEach (packageName) ->
       commands.push (callback) -> installPackage(packageName, callback)