maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check PATH when validating non-absolute paths

Browse source 
Fixes #119534
This commit is contained in:
Daniel Imms 2021-03-24 15:07:54 -07:00
parent 5c6836eb44
commit 189fb15df9
No known key found for this signature in database
GPG key ID: D12BE8272D6284CC
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/contrib/terminal/node/terminalProfiles.ts
View file

@ -5,9 +5,9 @@
import * as fs from 'fs';
import * as platform from 'vs/base/common/platform';
import { normalize, basename } from 'vs/base/common/path';
import { normalize, basename, delimiter } from 'vs/base/common/path';
import { enumeratePowerShellInstallations } from 'vs/base/node/powershell';
import { getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment';
import { findExecutable, getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment';
import { ITerminalConfiguration, ITerminalProfile, ITerminalProfileObject, ProfileSource } from 'vs/workbench/contrib/terminal/common/terminal';
import * as cp from 'child_process';
import { ExtHostVariableResolverService } from 'vs/workbench/api/common/extHostDebugService';
@ -239,7 +239,14 @@ async function validateProfilePaths(profileName: string, potentialPaths: string[
const profile = { profileName, path, args, overrideName, isAutoDetected };
// For non-absolute paths, check if it's available on $PATH
if (basename(path) === path) {
// The executable isn't an absolute path, try find it on the PATH
const envPaths: string[] | undefined = process.env.PATH ? process.env.PATH.split(delimiter) : undefined;
const executable = await findExecutable(path, undefined, envPaths);
if (!executable) {
return validateProfilePaths(profileName, potentialPaths, statProvider, args);
}
return profile;
}