From 4821ad5f43b33c6df68162b1c03fe626ac9dc2cb Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 12 Feb 2016 12:43:24 +0100 Subject: [PATCH] use ELECTRON_RUN_AS_NODE --- appveyor.yml | 2 +- extensions/typescript/src/utils/electron.ts | 2 +- extensions/typescript/src/utils/electronForkStart.ts | 4 ++-- resources/common/bin/code.sh | 2 +- resources/win32/bin/code.cmd | 2 +- resources/win32/bin/code.js | 2 +- scripts/test.bat | 2 +- scripts/test.sh | 4 ++-- src/vs/base/node/stdFork.ts | 2 +- src/vs/base/node/stdForkStart.js | 4 ++-- src/vs/workbench/electron-main/cli.ts | 2 +- .../parts/git/electron-browser/electronGitService.ts | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 75a06cf7bac..c9ad4c7064b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ environment: - ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1 + ELECTRON_RUN_AS_NODE: 1 install: - ps: Install-Product node 4.1.1 x64 diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts index 38535724218..9f456bb27d9 100644 --- a/extensions/typescript/src/utils/electron.ts +++ b/extensions/typescript/src/utils/electron.ts @@ -47,7 +47,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; - newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; + newEnv['ELECTRON_RUN_AS_NODE'] = '1'; return newEnv; } diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts index 34025e99ec4..fe349fa856b 100644 --- a/extensions/typescript/src/utils/electronForkStart.ts +++ b/extensions/typescript/src/utils/electronForkStart.ts @@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME']; log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName); -log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); +log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); // stdout redirection to named pipe (function() { @@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A // Unset the custom environmental variables that should not get inherited delete process.env['STDIN_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME']; - delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; + delete process.env['ELECTRON_RUN_AS_NODE']; require(program); diff --git a/resources/common/bin/code.sh b/resources/common/bin/code.sh index cad3b197491..b0841e09862 100755 --- a/resources/common/bin/code.sh +++ b/resources/common/bin/code.sh @@ -15,6 +15,6 @@ fi VSCODE_LAUNCHER="$VSCODE_DIR/resources/app/out/cli.js" -ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \ +ELECTRON_RUN_AS_NODE=1 VSCODE_PATH="$VSCODE_DIR/$ELECTRON_FILE" \ "$VSCODE_DIR/$ELECTRON_FILE" $VSCODE_LAUNCHER "$@" exit $? diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd index 4fe8b88f9d5..020e96ee01b 100644 --- a/resources/win32/bin/code.cmd +++ b/resources/win32/bin/code.cmd @@ -1,6 +1,6 @@ @echo off setlocal set VSCODE_DEV= -set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 +set ELECTRON_RUN_AS_NODE=1 "%~dp0..\\Code.exe" "%~dp0code.js" %* endlocal \ No newline at end of file diff --git a/resources/win32/bin/code.js b/resources/win32/bin/code.js index 6dbd04f3e4e..ce02dda2755 100644 --- a/resources/win32/bin/code.js +++ b/resources/win32/bin/code.js @@ -1,3 +1,3 @@ -delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; +delete process.env['ELECTRON_RUN_AS_NODE']; require('child_process').spawn(require('path').resolve(__dirname, '..', 'Code.exe'), process.argv.slice(2), { detached: true, stdio: 'ignore' }); process.exit(0); \ No newline at end of file diff --git a/scripts/test.bat b/scripts/test.bat index 25318c2248e..76f56d53cae 100644 --- a/scripts/test.bat +++ b/scripts/test.bat @@ -1,6 +1,6 @@ @echo off -set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 +set ELECTRON_RUN_AS_NODE=1 pushd %~dp0\.. .\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %* diff --git a/scripts/test.sh b/scripts/test.sh index bbad6e94060..a9778d98cb8 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -10,11 +10,11 @@ fi # Unit Tests if [[ "$OSTYPE" == "darwin"* ]]; then - cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ + cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \ ./.build/electron/Electron.app/Contents/MacOS/Electron \ node_modules/mocha/bin/_mocha $* else - cd $ROOT ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ + cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \ ./.build/electron/electron \ node_modules/mocha/bin/_mocha $* fi diff --git a/src/vs/base/node/stdFork.ts b/src/vs/base/node/stdFork.ts index cb5a510491a..01f96d38496 100644 --- a/src/vs/base/node/stdFork.ts +++ b/src/vs/base/node/stdFork.ts @@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; - newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; + newEnv['ELECTRON_RUN_AS_NODE'] = '1'; return newEnv; } diff --git a/src/vs/base/node/stdForkStart.js b/src/vs/base/node/stdForkStart.js index bb58479fcd8..0d7bc82f81c 100644 --- a/src/vs/base/node/stdForkStart.js +++ b/src/vs/base/node/stdForkStart.js @@ -31,7 +31,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME']; log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName); -log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); +log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); // stdout redirection to named pipe (function() { @@ -136,7 +136,7 @@ log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_A // Unset the custom environmental variables that should not get inherited delete process.env['STDIN_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME']; - delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; + delete process.env['ELECTRON_RUN_AS_NODE']; require(program); diff --git a/src/vs/workbench/electron-main/cli.ts b/src/vs/workbench/electron-main/cli.ts index fe380a5cad9..e066aae50af 100644 --- a/src/vs/workbench/electron-main/cli.ts +++ b/src/vs/workbench/electron-main/cli.ts @@ -45,7 +45,7 @@ export function main(argv: string[]) { } else if (argParser.hasFlag('version', 'v')) { console.log(packageJson.version); } else { - delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; + delete process.env['ELECTRON_RUN_AS_NODE']; spawn(process.env['VSCODE_PATH'], process.argv.slice(2), { detached: true, stdio: 'ignore' }); } diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts index b93eaa7385b..a57fb13acfc 100644 --- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts +++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts @@ -117,7 +117,7 @@ export function createNativeRawGitService(workspaceRoot: string, gitPath: string timeout: 1000 * 60, args: [gitPath, workspaceRoot, defaultEncoding, remote.process.execPath], env: { - ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1, + ELECTRON_RUN_AS_NODE: 1, AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp' } } -- GitLab