diff options
| author | Alexandru Dima <alexdima@microsoft.com> | 2021-11-10 02:11:12 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-10 02:11:12 +0300 |
| commit | e08e4d3fe1079f6ccb1b781f6089d9e573b81ca6 (patch) | |
| tree | 67a4162bfc71cd50740c6cde5f4cffe47ba2fceb /scripts | |
| parent | a4ad395f23ab80d535730574c3ac82b84c779d72 (diff) | |
Move `--ms-enable-electron-run-as-node` to a later location (#136786)
* Move `--ms-enable-electron-run-as-node` to a later location, which is not fatal in Electron builds that don't know it
* undo bad change
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/code-cli.bat | 2 | ||||
| -rwxr-xr-x | scripts/code-cli.sh | 2 | ||||
| -rwxr-xr-x | scripts/code.sh | 2 | ||||
| -rw-r--r-- | scripts/node-electron.bat | 2 | ||||
| -rwxr-xr-x | scripts/node-electron.sh | 8 |
5 files changed, 8 insertions, 8 deletions
diff --git a/scripts/code-cli.bat b/scripts/code-cli.bat index a4a2c68ae02..2b3c9db3ca3 100644 --- a/scripts/code-cli.bat +++ b/scripts/code-cli.bat @@ -24,7 +24,7 @@ set ELECTRON_ENABLE_LOGGING=1 set ELECTRON_ENABLE_STACK_DUMPING=1 :: Launch Code -%CODE% --ms-enable-electron-run-as-node --inspect=5874 out\cli.js %~dp0.. %* +%CODE% --inspect=5874 out\cli.js --ms-enable-electron-run-as-node %~dp0.. %* goto end :builtin diff --git a/scripts/code-cli.sh b/scripts/code-cli.sh index 7d70a40aeff..cdf75ff785c 100755 --- a/scripts/code-cli.sh +++ b/scripts/code-cli.sh @@ -34,7 +34,7 @@ function code() { VSCODE_DEV=1 \ ELECTRON_ENABLE_LOGGING=1 \ ELECTRON_ENABLE_STACK_DUMPING=1 \ - "$CODE" --ms-enable-electron-run-as-node --inspect=5874 "$ROOT/out/cli.js" . "$@" + "$CODE" --inspect=5874 "$ROOT/out/cli.js" --ms-enable-electron-run-as-node . "$@" } code "$@" diff --git a/scripts/code.sh b/scripts/code.sh index 528e76f9c54..08fc867ca12 100755 --- a/scripts/code.sh +++ b/scripts/code.sh @@ -58,7 +58,7 @@ function code-wsl() cd $ROOT export WSLENV=ELECTRON_RUN_AS_NODE/w:VSCODE_DEV/w:$WSLENV local WSL_EXT_ID="ms-vscode-remote.remote-wsl" - local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" --ms-enable-electron-run-as-node "out/cli.js" --locate-extension $WSL_EXT_ID) + local WSL_EXT_WLOC=$(echo "" | VSCODE_DEV=1 ELECTRON_RUN_AS_NODE=1 "$ROOT/.build/electron/Code - OSS.exe" "out/cli.js" --ms-enable-electron-run-as-node --locate-extension $WSL_EXT_ID) cd $CWD if [ -n "$WSL_EXT_WLOC" ]; then # replace \r\n with \n in WSL_EXT_WLOC diff --git a/scripts/node-electron.bat b/scripts/node-electron.bat index 0d91ca9bc02..c67e2ea607d 100644 --- a/scripts/node-electron.bat +++ b/scripts/node-electron.bat @@ -10,7 +10,7 @@ set NAMESHORT=%NAMESHORT: "=% set NAMESHORT=%NAMESHORT:"=%.exe set CODE=".build\electron\%NAMESHORT%" -%CODE% --ms-enable-electron-run-as-node %* +%CODE% %* --ms-enable-electron-run-as-node popd diff --git a/scripts/node-electron.sh b/scripts/node-electron.sh index 2e4dc6dbfe1..2bf50817c94 100755 --- a/scripts/node-electron.sh +++ b/scripts/node-electron.sh @@ -26,11 +26,11 @@ export VSCODE_DEV=1 if [[ "$OSTYPE" == "darwin"* ]]; then ulimit -n 4096 ; ELECTRON_RUN_AS_NODE=1 \ "$CODE" \ - --ms-enable-electron-run-as-node \ - "$@" + "$@" \ + --ms-enable-electron-run-as-node else ELECTRON_RUN_AS_NODE=1 \ "$CODE" \ - --ms-enable-electron-run-as-node \ - "$@" + "$@" \ + --ms-enable-electron-run-as-node fi |