Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detect git bash installs using PATH #176063

Merged
merged 2 commits into from
Mar 3, 2023
Merged

Detect git bash installs using PATH #176063

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3b2ead
Detect git bash installs using PATH
Tyriar Mar 3, 2023
5bd1e16
Clarify git -> git bash
Tyriar Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 45 additions & 13 deletions src/vs/platform/terminal/node/terminalProfiles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { ILogService } from 'vs/platform/log/common/log';
import { ITerminalEnvironment, ITerminalExecutable, ITerminalProfile, ITerminalProfileSource, ITerminalUnsafePath, ProfileSource, TerminalIcon, TerminalSettingId } from 'vs/platform/terminal/common/terminal';
import { findExecutable, getWindowsBuildNumber } from 'vs/platform/terminal/node/terminalEnvironment';
import { ThemeIcon } from 'vs/base/common/themables';
import { dirname, resolve } from 'path';

let profileSources: Map<string, IPotentialTerminalProfile> | undefined;
let logIfWslNotInstalled: boolean = true;
Expand Down Expand Up @@ -257,29 +258,60 @@ async function initializeWindowsProfiles(testPwshSourcePaths?: string[]): Promis
return;
}

const [gitBashPaths, pwshPaths] = await Promise.all([getGitBashPaths(), testPwshSourcePaths || getPowershellPaths()]);

profileSources = new Map();
profileSources.set(
'Git Bash', {
ProfileSource.GitBash, {
profileName: 'Git Bash',
paths: [
`${process.env['ProgramW6432']}\\Git\\bin\\bash.exe`,
`${process.env['ProgramW6432']}\\Git\\usr\\bin\\bash.exe`,
`${process.env['ProgramFiles']}\\Git\\bin\\bash.exe`,
`${process.env['ProgramFiles']}\\Git\\usr\\bin\\bash.exe`,
`${process.env['ProgramFiles(X86)']}\\Git\\bin\\bash.exe`,
`${process.env['ProgramFiles(X86)']}\\Git\\usr\\bin\\bash.exe`,
`${process.env['LocalAppData']}\\Programs\\Git\\bin\\bash.exe`,
`${process.env['UserProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`,
],
paths: gitBashPaths,
args: ['--login', '-i']
});
profileSources.set('PowerShell', {
profileSources.set(ProfileSource.Pwsh, {
profileName: 'PowerShell',
paths: testPwshSourcePaths || await getPowershellPaths(),
paths: pwshPaths,
icon: Codicon.terminalPowershell
});
}

async function getGitBashPaths(): Promise<string[]> {
const gitDirs: Set<string> = new Set();

// Look for git.exe on the PATH and use that if found. git.exe is located at
// `<installdir>/cmd/git.exe`. This is not an unsafe location because the git executable is
// located on the PATH which is only controlled by the user/admin.
const gitExePath = await findExecutable('git.exe');
if (gitExePath) {
const gitExeDir = dirname(gitExePath);
gitDirs.add(resolve(gitExeDir, '../..'));
console.log('gitDirs', gitDirs);
}
function addTruthy<T>(set: Set<T>, value: T | undefined): void {
if (value) {
set.add(value);
}
}

// Add common git install locations
addTruthy(gitDirs, process.env['ProgramW6432']);
addTruthy(gitDirs, process.env['ProgramFiles']);
addTruthy(gitDirs, process.env['ProgramFiles(X86)']);
addTruthy(gitDirs, `${process.env['LocalAppData']}\\Program`);

const gitBashPaths: string[] = [];
for (const gitDir of gitDirs) {
gitBashPaths.push(
`${gitDir}\\Git\\bin\\bash.exe`,
`${gitDir}\\Git\\usr\\bin\\bash.exe`
);
}

// Add special installs that don't follow the standard directory structure
gitBashPaths.push(`${process.env['UserProfile']}\\scoop\\apps\\git-with-openssh\\current\\bin\\bash.exe`);

return gitBashPaths;
}

async function getPowershellPaths(): Promise<string[]> {
const paths: string[] = [];
// Add all of the different kinds of PowerShells
Expand Down