mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-24 16:54:43 +00:00
fix(desktop): join Windows bash candidates with path.win32 in find-git-bash
The extracted findGitBash builds Windows-style candidate paths, but the vitest suite (and any POSIX CI host) runs with posix path.join, which mangles 'C:\Program Files' + segments into slash-joined paths and broke the invalid-override fallback test. Use path.win32.join explicitly so candidate construction is host-independent.
This commit is contained in:
parent
ebf5426b1a
commit
6c2c866a9a
1 changed files with 9 additions and 5 deletions
|
|
@ -30,16 +30,20 @@ export function findGitBash(opts: GitBashOptions): string | null {
|
|||
const localAppData = env.LOCALAPPDATA || ''
|
||||
const candidates: string[] = []
|
||||
|
||||
// Candidate paths are Windows paths regardless of host platform (tests run
|
||||
// on POSIX CI hosts too), so join with win32 semantics explicitly.
|
||||
const joinWin = path.win32.join
|
||||
|
||||
if (localAppData) {
|
||||
candidates.push(path.join(localAppData, 'hermes', 'git', 'bin', 'bash.exe'))
|
||||
candidates.push(path.join(localAppData, 'hermes', 'git', 'usr', 'bin', 'bash.exe'))
|
||||
candidates.push(joinWin(localAppData, 'hermes', 'git', 'bin', 'bash.exe'))
|
||||
candidates.push(joinWin(localAppData, 'hermes', 'git', 'usr', 'bin', 'bash.exe'))
|
||||
}
|
||||
|
||||
candidates.push(path.join(env['ProgramFiles'] || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'))
|
||||
candidates.push(path.join(env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'))
|
||||
candidates.push(joinWin(env['ProgramFiles'] || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'))
|
||||
candidates.push(joinWin(env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'))
|
||||
|
||||
if (localAppData) {
|
||||
candidates.push(path.join(localAppData, 'Programs', 'Git', 'bin', 'bash.exe'))
|
||||
candidates.push(joinWin(localAppData, 'Programs', 'Git', 'bin', 'bash.exe'))
|
||||
}
|
||||
|
||||
for (const candidate of candidates) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue