Skip to content

Commit d38b26e

Browse files
committed
fix(desktop): exclude WSL interop paths
1 parent 5f0c2bd commit d38b26e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎packages/desktop/src/main/wsl/runtime.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mock.module("@lydell/node-pty", () => ({
2929

3030
const { resolveWslOpencode } = await import("./runtime")
3131

32-
test("resolves OpenCode from the distro PATH", async () => {
32+
test("resolves OpenCode from the distro PATH without Windows interop entries", async () => {
3333
calls.length = 0
3434
stdout = "/home/alice/.local/bin/opencode\n"
3535

@@ -41,7 +41,7 @@ test("resolves OpenCode from the distro PATH", async () => {
4141
"--",
4242
"sh",
4343
"-c",
44-
'command -v opencode || { [ -x "$HOME/.opencode/bin/opencode" ] && printf "%s\\n" "$HOME/.opencode/bin/opencode"; }',
44+
'PATH=$(printf "%s" "$PATH" | awk -v RS=: -v ORS=: \'$0 !~ /^\\/mnt\\//\' | sed "s/:$//"); export PATH; command -v opencode || { [ -x "$HOME/.opencode/bin/opencode" ] && printf "%s\\n" "$HOME/.opencode/bin/opencode"; }',
4545
],
4646
])
4747
})

‎packages/desktop/src/main/wsl/runtime.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ export async function resolveWslOpencode(distro: string, opts?: RunWslOptions) {
314314
[
315315
"sh",
316316
"-c",
317-
'command -v opencode || { [ -x "$HOME/.opencode/bin/opencode" ] && printf "%s\\n" "$HOME/.opencode/bin/opencode"; }',
317+
'PATH=$(printf "%s" "$PATH" | awk -v RS=: -v ORS=: \'$0 !~ /^\\/mnt\\//\' | sed "s/:$//"); export PATH; command -v opencode || { [ -x "$HOME/.opencode/bin/opencode" ] && printf "%s\\n" "$HOME/.opencode/bin/opencode"; }',
318318
],
319319
distro,
320320
opts,

0 commit comments

Comments
 (0)