From 324e8d6c7a2bae45a313eb911158aa9122acdbdc Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 11 Aug 2016 14:30:22 -0600 Subject: [PATCH] Move env assignment into parseCommandLine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A bit of a misnomer but makes things more testable so I’ll accept it until we can do more overhaul. --- src/main-process/main.js | 1 - src/main-process/parse-command-line.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main-process/main.js b/src/main-process/main.js index 990256596..573192343 100644 --- a/src/main-process/main.js +++ b/src/main-process/main.js @@ -21,7 +21,6 @@ console.log = require('nslog') function start () { const args = parseCommandLine(process.argv.slice(1)) - args.env = process.env setupAtomHome(args) setupCompileCache() diff --git a/src/main-process/parse-command-line.js b/src/main-process/parse-command-line.js index 96f128254..820560f8b 100644 --- a/src/main-process/parse-command-line.js +++ b/src/main-process/parse-command-line.js @@ -130,7 +130,7 @@ module.exports = function parseCommandLine (processArgs) { resourcePath, devResourcePath, pathsToOpen, urlsToOpen, executedFrom, test, version, pidToKillWhenClosed, devMode, safeMode, newWindow, logFile, socketPath, userDataDir, profileStartup, timeout, setPortable, clearWindowState, - addToLastWindow, mainProcess + addToLastWindow, mainProcess, env: process.env } }