diff options
| author | Kit Langton <[email protected]> | 2026-04-15 20:45:19 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-04-15 20:45:19 -0400 |
| commit | 3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0 (patch) | |
| tree | ecdd8fa222dd57683298409ef0b84cfd1d1ebc24 /packages/desktop-electron/src | |
| parent | a554fad2327c68b2dc562a19e62a96415028b6d8 (diff) | |
| download | opencode-3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0.tar.gz opencode-3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0.zip | |
feat: add oxlint with correctness defaults (#22682)
Diffstat (limited to 'packages/desktop-electron/src')
| -rw-r--r-- | packages/desktop-electron/src/main/apps.ts | 2 | ||||
| -rw-r--r-- | packages/desktop-electron/src/main/shell-env.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/desktop-electron/src/main/apps.ts b/packages/desktop-electron/src/main/apps.ts index 2b4603789..d21b6cc9e 100644 --- a/packages/desktop-electron/src/main/apps.ts +++ b/packages/desktop-electron/src/main/apps.ts @@ -20,7 +20,7 @@ export function wslPath(path: string, mode: "windows" | "linux" | null): string try { if (path.startsWith("~")) { const suffix = path.slice(1) - const cmd = `wslpath ${flag} \"$HOME${suffix.replace(/\"/g, '\\"')}\"` + const cmd = `wslpath ${flag} "$HOME${suffix.replace(/"/g, '\\"')}"` const output = execFileSync("wsl", ["-e", "sh", "-lc", cmd]) return output.toString().trim() } diff --git a/packages/desktop-electron/src/main/shell-env.ts b/packages/desktop-electron/src/main/shell-env.ts index 8453a5730..f57677323 100644 --- a/packages/desktop-electron/src/main/shell-env.ts +++ b/packages/desktop-electron/src/main/shell-env.ts @@ -82,7 +82,7 @@ export function loadShellEnv(shell: string) { export function mergeShellEnv(shell: Record<string, string> | null, env: Record<string, string>) { return { - ...(shell || {}), + ...shell, ...env, } } |