Skip to content

Commit 197d0b6

Browse files
committed
Strip internal env vars when spawning the shell
This should fix all those reports of code-server dropping straight to Node and things like #1121.
1 parent 422503e commit 197d0b6

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

scripts/vscode.patch

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,21 @@ index a657f4a4d9..66bd13dffa 100644
5050
} else if (typeof process === 'object') {
5151
_isWindows = (process.platform === 'win32');
5252
_isMacintosh = (process.platform === 'darwin');
53+
diff --git a/src/vs/base/common/processes.ts b/src/vs/base/common/processes.ts
54+
index c52f7b3774..5635cfac8a 100644
55+
--- a/src/vs/base/common/processes.ts
56+
+++ b/src/vs/base/common/processes.ts
57+
@@ -110,7 +110,9 @@ export function sanitizeProcessEnvironment(env: IProcessEnvironment, ...preserve
58+
/^ELECTRON_.+$/,
59+
/^GOOGLE_API_KEY$/,
60+
/^VSCODE_.+$/,
61+
- /^SNAP(|_.*)$/
62+
+ /^SNAP(|_.*)$/,
63+
+ /^NBIN_BYPASS$/,
64+
+ /^LAUNCH_VSCODE$/
65+
];
66+
const envKeys = Object.keys(env);
67+
envKeys
5368
diff --git a/src/vs/base/node/languagePacks.js b/src/vs/base/node/languagePacks.js
5469
index 3ae24454cb..fac8679290 100644
5570
--- a/src/vs/base/node/languagePacks.js

0 commit comments

Comments
 (0)