107e6fc4af
When git itself cannot be spawned (ENOENT, EACCES, or Darwin's EBADARCH, which Node surfaces as a bare errno -86 "spawn Unknown system error -86"), the update check rejected with the raw spawn error and both the updates overlay and Settings > About led with "couldn't reach the update server" — a network diagnosis for a local Intel-only git that macOS refuses to run. runGit now maps child 'error' events through describeGitSpawnFailure() (pure, in select-runnable-binary.ts) to "Git on this computer cannot run (<path>: Bad CPU type in executable). Install a Git build for this machine (on macOS: `xcode-select --install`) and check again.", the IPC catch tags the status error 'git-unusable', and the two renderer surfaces lead with a new updates.gitUnusable copy for that tag. Nonzero git exits never fire 'error', so their existing wording is unchanged. Closes the second expected-behaviour atom of #114718.
71 lines
2.9 KiB
TypeScript
71 lines
2.9 KiB
TypeScript
export interface RunnableBinaryOptions {
|
|
/** Ordered candidate absolute paths, highest preference first. */
|
|
candidates: string[]
|
|
fileExists: (filePath: string) => boolean
|
|
/** Probe: does this candidate actually execute (`<binary> --version`)? */
|
|
binaryRuns: (filePath: string) => boolean
|
|
}
|
|
|
|
/**
|
|
* Pick the first candidate that both exists on disk and runs, falling back to
|
|
* the first that merely exists, then to null.
|
|
*
|
|
* A file can exist and still be unlaunchable: on macOS an Intel-only binary
|
|
* ahead on PATH (Homebrew under Rosetta gone after an OS update) fails at
|
|
* spawn time with errno -86 (EBADARCH, "Bad CPU type in executable"), which
|
|
* callers then misreport as a network/update-server problem because the
|
|
* failure only surfaces when the child is spawned. Existence-only selection
|
|
* (`candidates.find(fileExists)`, first PATH hit) commits to the broken
|
|
* candidate by construction and never looks at the working one right after it.
|
|
*
|
|
* The existence-only fallback keeps behaviour unchanged where the probe itself
|
|
* cannot run (locked-down execution policy, AV interposing on spawn) rather
|
|
* than skipping a binary that would have worked.
|
|
*
|
|
* Resolution order (first match wins):
|
|
* 1. a candidate that exists and runs
|
|
* 2. a candidate that merely exists
|
|
* 3. null — caller falls back to its own PATH/bare-name resolution
|
|
*/
|
|
export function selectRunnableBinary(opts: RunnableBinaryOptions): string | null {
|
|
const existing = opts.candidates.filter(opts.fileExists)
|
|
|
|
return existing.find(opts.binaryRuns) || existing[0] || null
|
|
}
|
|
|
|
/** Marker on the error runGit rejects with when the git binary itself could not be spawned. */
|
|
export const GIT_UNUSABLE = 'git-unusable'
|
|
|
|
const SPAWN_FAILURE_REASONS: Record<string, string> = {
|
|
ENOENT: 'not found',
|
|
EACCES: 'permission denied',
|
|
EBADARCH: 'Bad CPU type in executable'
|
|
}
|
|
|
|
/**
|
|
* Turn a child-process 'error' (the binary never ran, as opposed to running
|
|
* and exiting nonzero) into an actionable local-executable message.
|
|
*
|
|
* Without this the caller shows the update-server/network copy plus the raw
|
|
* `spawn Unknown system error -86` — a network claim for a local Intel-only
|
|
* git that macOS refuses to launch (EBADARCH is errno 86 on Darwin, surfaced by
|
|
* Node as errno -86 with no `code`). The message names the binary that failed
|
|
* so the user can replace it; nothing in this path is a network problem.
|
|
*
|
|
* Returns null for anything that is not a spawn-level failure so those keep
|
|
* their existing wording.
|
|
*/
|
|
export function describeGitSpawnFailure(error: any, binaryPath: string): string | null {
|
|
const code = error?.code || (error?.errno === -86 ? 'EBADARCH' : '')
|
|
const reason = SPAWN_FAILURE_REASONS[code]
|
|
|
|
if (!reason) {
|
|
return null
|
|
}
|
|
|
|
return (
|
|
`Git on this computer cannot run (${binaryPath}: ${reason}). ` +
|
|
'Install a Git build for this machine (on macOS: `xcode-select --install`) and check again.'
|
|
)
|
|
}
|