From d46c0646f239f04cefc3649bc998cb0c15993f4e Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Mon, 15 Feb 2016 11:07:01 +0100 Subject: [PATCH] move 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.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 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c9ad4c7064b..75a06cf7bac 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 4.1.1 x64 diff --git a/extensions/typescript/src/utils/electron.ts b/extensions/typescript/src/utils/electron.ts index a0ea142b7db..25b780e4bfc 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['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 2be54bfcce2..bfecf8031f0 100644 --- a/extensions/typescript/src/utils/electronForkStart.ts +++ b/extensions/typescript/src/utils/electronForkStart.ts @@ -29,7 +29,7 @@ var stdOutPipeName = process.env['STDOUT_PIPE_NAME']; log('STDIN_PIPE_NAME: ' + stdInPipeName); log('STDOUT_PIPE_NAME: ' + stdOutPipeName); -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() { @@ -134,7 +134,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); // 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['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 7d773bfd34e..3ab0d605e15 100755 --- a/resources/darwin/bin/code.sh +++ b/resources/darwin/bin/code.sh @@ -7,5 +7,5 @@ function realpath() { python -c "import os,sys; print os.path.realpath(sys.argv[ 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 8d9506f910b..4806c026b61 100755 --- a/resources/linux/bin/code.sh +++ b/resources/linux/bin/code.sh @@ -7,5 +7,5 @@ NAME="@@NAME@@" VSCODE_PATH="/usr/share/$NAME" 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 $? diff --git a/resources/win32/bin/code.cmd b/resources/win32/bin/code.cmd index 020e96ee01b..4fe8b88f9d5 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 "%~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 ce02dda2755..6dbd04f3e4e 100644 --- a/resources/win32/bin/code.js +++ b/resources/win32/bin/code.js @@ -1,3 +1,3 @@ -delete process.env['ELECTRON_RUN_AS_NODE']; +delete process.env['ATOM_SHELL_INTERNAL_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 76f56d53cae..25318c2248e 100644 --- a/scripts/test.bat +++ b/scripts/test.bat @@ -1,6 +1,6 @@ @echo off -set ELECTRON_RUN_AS_NODE=1 +set ATOM_SHELL_INTERNAL_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 a9778d98cb8..bbad6e94060 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 ; 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 01f96d38496..cb5a510491a 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['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 0d7bc82f81c..bb58479fcd8 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('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() { @@ -136,7 +136,7 @@ log('ELECTRON_RUN_AS_NODE: ' + process.env['ELECTRON_RUN_AS_NODE']); // 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['ELECTRON_RUN_AS_NODE']; + delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; require(program); diff --git a/src/vs/workbench/electron-main/cli.ts b/src/vs/workbench/electron-main/cli.ts index 8b02662b162..2e67231b182 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['ELECTRON_RUN_AS_NODE']; + delete process.env['ATOM_SHELL_INTERNAL_RUN_AS_NODE']; spawn(process.execPath, 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 7bba3cbfa25..f262c6c31a5 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: { - ELECTRON_RUN_AS_NODE: 1, + ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1, AMD_ENTRYPOINT: 'vs/workbench/parts/git/electron-browser/gitApp' } }