luna/oh-my-opencode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: detect Git Bash/WSL/MSYS2 shell on Windows before PSModulePath

Browse Source 
On Windows, PSModulePath is always set by the system even when the
active shell is Git Bash, WSL, or MSYS2. detectShellType() returned
'powershell' in these cases, causing the non-interactive-env hook to
prepend PowerShell $env: syntax which Git Bash cannot parse.

Adds checks for TERM, BASH_VERSION, MSYSTEM, and WSL_DISTRO_NAME
before the PSModulePath check to correctly identify Unix shells.

Fixes #3366
This commit is contained in:
Zireael
2026-04-13 01:30:53 +02:00
parent 3d2eb6e471
commit 998dbde2aa
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/shell-env.ts
+19 -5
View File
@@ -5,12 +5,14 @@ export type ShellType = "unix" | "powershell" | "cmd" | "csh"
* *
* Detection priority: * Detection priority:
* 1. SHELL env var → Unix shell (explicit user choice takes precedence) * 1. SHELL env var → Unix shell (explicit user choice takes precedence)
* 2. PSModulePath → PowerShell * 2. Unix shell indicators on Windows → Git Bash, WSL, MSYS2
* 3. Platform fallback → win32: cmd, others: unix * 3. PSModulePath → PowerShell
* 4. Platform fallback → win32: cmd, others: unix
* *
* Note: SHELL is checked before PSModulePath because on Windows, PSModulePath * Note: Step 2 is scoped to Windows only because PSModulePath is always set
* is always set by the system even when the active shell is Git Bash or WSL. * on Windows regardless of the active shell. Indicators are deliberately
* An explicit SHELL variable indicates the user's chosen shell overrides that. * specific (BASH_VERSION, MSYSTEM, WSL_DISTRO_NAME) — TERM is excluded
* because some PowerShell users set it manually.
*/ */
export function detectShellType(): ShellType { export function detectShellType(): ShellType {
if (process.env.SHELL) { if (process.env.SHELL) {
@@ -21,6 +23,18 @@ export function detectShellType(): ShellType {
return "unix" return "unix"
} }
// On Windows, detect Unix-compatible shells (Git Bash, WSL, MSYS2).
// PSModulePath is always set on Windows, so we must check these BEFORE it.
// Indicators are shell-specific — no broad signals like TERM.
if (
process.platform === "win32" &&
(process.env.BASH_VERSION ||
process.env.MSYSTEM ||
process.env.WSL_DISTRO_NAME)
) {
return "unix"
}
if (process.env.PSModulePath) { if (process.env.PSModulePath) {
return "powershell" return "powershell"
} }