From 0525466708af596948130be2119c2de7127ab7df Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 8 Jul 2016 16:12:04 +0200 Subject: [PATCH] back to ATOM_SHELL_INTERNAL_RUN_AS_NODE --- appveyor.yml | 2 +- extensions/typescript/src/utils/electron.ts | 2 +- extensions/typescript/src/utils/electronForkStart.ts | 4 ++-- resources/darwin/bin/code.sh | 2 +- resources/linux/bin/code.sh | 2 +- resources/win32/bin/code.cmd | 2 +- resources/win32/bin/code.sh | 2 +- scripts/code-cli.sh | 2 +- scripts/test-integration.bat | 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/code/electron-main/main.ts | 8 ++++---- src/vs/code/node/cli.ts | 2 +- .../parts/debug/electron-browser/debugService.ts | 2 +- .../parts/git/electron-browser/electronGitService.ts | 2 +- .../parts/terminal/electron-browser/terminalProcess.js | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5978e14c13d..459e550af38 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ environment: - ELECTRON_RUN_AS_NODE: 1 + ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1 install: - ps: Install-Product node 5.10.1 x64 diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts index c0bda301689..a4e08453f9f 100644 --- a/extensions/typescript/src/utils/electron.ts +++ b/extensions/typescript/src/utils/electron.ts @@ -48,7 +48,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; newEnv['STDERR_PIPE_NAME'] = stdErrPipeName; - newEnv['ELECTRON_RUN_AS_NODE'] = '1'; + newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; return newEnv; } diff --git a/extensions/typescript/src/utils/electronForkStart.ts b/extensions/typescript/src/utils/electronForkStart.ts index 83f75724002..46a12506041 100644 --- a/extensions/typescript/src/utils/electronForkStart.ts +++ b/extensions/typescript/src/utils/electronForkStart.ts @@ -31,7 +31,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME']; log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDERR_PIPE_NAME: ' + stdErrPipeName); -log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); +log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); // stdout redirection to named pipe (function() { @@ -147,7 +147,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); delete process.env['STDIN_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME']; delete process.env['STDERR_PIPE_NAME']; - delete process.env['ELECTRON_RUN_AS_NODE']; + delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; require(program); diff --git a/resources/darwin/bin/code.sh b/resources/darwin/bin/code.sh index 9dba3f8e378..ac498810000 100755 --- a/resources/darwin/bin/code.sh +++ b/resources/darwin/bin/code.sh @@ -7,5 +7,5 @@ function realpath() { /usr/bin/python -c "import os,sys; print os.path.realpath( CONTENTS="$(dirname "$(dirname "$(dirname "$(dirname "$(realpath "$0")")")")")" ELECTRON="$CONTENTS/MacOS/Electron" CLI="$CONTENTS/Resources/app/out/cli.js" -ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" +ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" exit $? \ No newline at end of file diff --git a/resources/linux/bin/code.sh b/resources/linux/bin/code.sh index f0877aa4c9f..77fa49722f7 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -33,5 +33,5 @@ fi ELECTRON="$VSCODE_PATH/@@NAME@@" CLI="$VSCODE_PATH/resources/app/out/cli.js" -ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" +ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" exit $? \ No newline at end of file diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd index 54f206831a9..a975610eb31 100644 --- a/resources/win32/bin/code.cmd +++ b/resources/win32/bin/code.cmd @@ -1,6 +1,6 @@ @echo off setlocal set VSCODE_DEV= -set ELECTRON_RUN_AS_NODE=1 +set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 call "%~dp0..\@@NAME@@.exe" "%~dp0..\resources\\app\\out\\cli.js" %* endlocal \ No newline at end of file diff --git a/resources/win32/bin/code.sh b/resources/win32/bin/code.sh index a9bab00a6d2..fd9f4bd0ffc 100644 --- a/resources/win32/bin/code.sh +++ b/resources/win32/bin/code.sh @@ -7,5 +7,5 @@ NAME="@@NAME@@" VSCODE_PATH="$(dirname "$(dirname "$(realpath "$0")")")" ELECTRON="$VSCODE_PATH/$NAME.exe" CLI="$VSCODE_PATH/resources/app/out/cli.js" -ELECTRON_NO_ATTACH_CONSOLE=1 ELECTRON_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" +ELECTRON_NO_ATTACH_CONSOLE=1 ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 "$ELECTRON" "$CLI" "$@" exit $? diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh index eb1ed814f5a..2719ec4d4b7 100755 --- a/scripts/code-cli.sh +++ b/scripts/code-cli.sh @@ -26,7 +26,7 @@ function code() { CLI="$ROOT/out/cli.js" - ELECTRON_RUN_AS_NODE=1 \ + ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ NODE_ENV=development \ VSCODE_DEV=1 \ ELECTRON_ENABLE_LOGGING=1 \ diff --git a/scripts/test-integration.bat b/scripts/test-integration.bat index fddb23d1dff..87dec89d1a1 100644 --- a/scripts/test-integration.bat +++ b/scripts/test-integration.bat @@ -4,7 +4,7 @@ setlocal rem APPVEYOR Builds if not "%APPVEYOR%" == "" ( set ELECTRON_NO_ATTACH_CONSOLE=1 - set ELECTRON_RUN_AS_NODE= + set ATOM_SHELL_INTERNAL_RUN_AS_NODE= ) :: Integration Tests diff --git a/scripts/test.bat b/scripts/test.bat index 15a4aaea84a..d62f7aba5eb 100644 --- a/scripts/test.bat +++ b/scripts/test.bat @@ -1,7 +1,7 @@ @echo off setlocal -set ELECTRON_RUN_AS_NODE=1 +set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 rem TFS Builds if not "%BUILD_BUILDID%" == "" ( diff --git a/scripts/test.sh b/scripts/test.sh index 9910abbeb57..6df7101b848 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -21,11 +21,11 @@ test -d out || ./node_modules/.bin/gulp compile # Unit Tests if [[ "$OSTYPE" == "darwin"* ]]; then - cd $ROOT ; ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \ + cd $ROOT ; ulimit -n 4096 ; ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 \ ./.build/electron/Electron.app/Contents/MacOS/Electron \ node_modules/mocha/bin/_mocha $* else - cd $ROOT ; ELECTRON_RUN_AS_NODE=1 \ + cd $ROOT ; ATOM_SHELL_INTERNAL_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 4bb749129ff..4751a8fa83b 100644 --- a/src/vs/base/node/stdFork.ts +++ b/src/vs/base/node/stdFork.ts @@ -49,7 +49,7 @@ function generatePatchedEnv(env:any, stdInPipeName:string, stdOutPipeName:string newEnv['STDIN_PIPE_NAME'] = stdInPipeName; newEnv['STDOUT_PIPE_NAME'] = stdOutPipeName; newEnv['STDERR_PIPE_NAME'] = stdErrPipeName; - newEnv['ELECTRON_RUN_AS_NODE'] = '1'; + newEnv['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = '1'; return newEnv; } diff --git a/src/vs/base/node/stdForkStart.js b/src/vs/base/node/stdForkStart.js index 92024acf6b8..0b1e7382fe5 100644 --- a/src/vs/base/node/stdForkStart.js +++ b/src/vs/base/node/stdForkStart.js @@ -33,7 +33,7 @@ var stdErrPipeName = process.env['STDERR_PIPE_NAME']; log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName); log('STDERR_PIPE_NAME: ' + stdErrPipeName); -log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); +log('ATOM_SHELL_INTERNAL_RUN_AS_NODE: ' + process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']); // stdout redirection to named pipe (function() { @@ -149,7 +149,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); delete process.env['STDIN_PIPE_NAME']; delete process.env['STDOUT_PIPE_NAME']; delete process.env['STDERR_PIPE_NAME']; - delete process.env['ELECTRON_RUN_AS_NODE']; + delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; require(program); diff --git a/src/vs/code/electron-main/main.ts b/src/vs/code/electron-main/main.ts index 25041c383e5..9f4fcab157c 100644 --- a/src/vs/code/electron-main/main.ts +++ b/src/vs/code/electron-main/main.ts @@ -285,11 +285,11 @@ interface IEnv { function getUnixUserEnvironment(): TPromise { const promise = new TPromise((c, e) => { - const runAsNode = process.env['ELECTRON_RUN_AS_NODE']; + const runAsNode = process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; const noAttach = process.env['ELECTRON_NO_ATTACH_CONSOLE']; const env = assign({}, process.env, { - ELECTRON_RUN_AS_NODE: '1', + ATOM_SHELL_INTERNAL_RUN_AS_NODE: '1', ELECTRON_NO_ATTACH_CONSOLE: '1' }); @@ -321,9 +321,9 @@ function getUnixUserEnvironment(): TPromise { const env = JSON.parse(raw); if (runAsNode) { - env['ELECTRON_RUN_AS_NODE'] = runAsNode; + env['ATOM_SHELL_INTERNAL_RUN_AS_NODE'] = runAsNode; } else { - delete env['ELECTRON_RUN_AS_NODE']; + delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; } if (noAttach) { diff --git a/src/vs/code/node/cli.ts b/src/vs/code/node/cli.ts index ee5beb41a03..6dcfb032797 100644 --- a/src/vs/code/node/cli.ts +++ b/src/vs/code/node/cli.ts @@ -33,7 +33,7 @@ export function main(args: string[]): TPromise { 'VSCODE_CLI': '1', 'ELECTRON_NO_ATTACH_CONSOLE': '1' }); - delete env['ELECTRON_RUN_AS_NODE']; + delete env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; let options = { detached: true, diff --git a/src/vs/workbench/parts/debug/electron-browser/debugService.ts b/src/vs/workbench/parts/debug/electron-browser/debugService.ts index 95804eaf5f8..de1537c1f1a 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugService.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugService.ts @@ -593,7 +593,7 @@ export class DebugService implements debug.IDebugService { timeout: 1000 * 60 * 5, args: [`${ publisher }.${ type }`, JSON.stringify(data), aiKey], env: { - ELECTRON_RUN_AS_NODE: 1, + ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1, PIPE_LOGGING: 'true', AMD_ENTRYPOINT: 'vs/workbench/parts/debug/node/telemetryApp' } diff --git a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts index 2e2d28d17b2..18c83311cb9 100644 --- a/src/vs/workbench/parts/git/electron-browser/electronGitService.ts +++ b/src/vs/workbench/parts/git/electron-browser/electronGitService.ts @@ -157,7 +157,7 @@ function createRemoteRawGitService(gitPath: string, workspaceRoot: string, encod timeout: 1000 * 60, args: [path, workspaceRoot, encoding, remote.process.execPath, version], env: { - ELECTRON_RUN_AS_NODE: 1, + ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1, PIPE_LOGGING: 'true', AMD_ENTRYPOINT: 'vs/workbench/parts/git/node/gitApp', VERBOSE_LOGGING: String(verbose) diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js b/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js index 138b671def3..21c47a26878 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalProcess.js @@ -63,7 +63,7 @@ function getArgs() { function cleanEnv() { var keys = [ - 'ELECTRON_RUN_AS_NODE', + 'ATOM_SHELL_INTERNAL_RUN_AS_NODE', 'PTYCWD', 'PTYPID', 'PTYSHELL' -- GitLab