Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-06-02 21:55:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fall back on node API when $SHELL is not set, for

Browse Source 
user shell and shell environment discovery
See github/codespaces#1639
This commit is contained in:
Rob Lourens
2020-12-13 19:25:10 -08:00
parent 96b426ef1d
commit dce22cf74b
6 changed files with 78 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/code/node/shellEnv.ts
+4 -2
View File
@@ -5,11 +5,12 @@
import { spawn } from 'child_process';
import { generateUuid } from 'vs/base/common/uuid';
import { isWindows } from 'vs/base/common/platform';
import { isWindows, platform } from 'vs/base/common/platform';
import { ILogService } from 'vs/platform/log/common/log';
import { NativeParsedArgs } from 'vs/platform/environment/common/argv';
import { isLaunchedFromCli } from 'vs/platform/environment/node/argvHelper';
import { toErrorMessage } from 'vs/base/common/errorMessage';
import { getSystemShell } from 'vs/base/node/shell';
/**
* We need to get the environment from a user's shell.
@@ -78,7 +79,8 @@ async function doResolveUnixShellEnv(logService: ILogService): Promise<typeof pr
logService.trace('getUnixShellEnvironment#env', env);
logService.trace('getUnixShellEnvironment#spawn', command);
const child = spawn(process.env.SHELL!, ['-ilc', command], {
const systemShellUnix = getSystemShell(platform);
const child = spawn(systemShellUnix, ['-ilc', command], {
detached: true,
stdio: ['ignore', 'pipe', process.stderr],
env