diff --git a/packages/app/src/wsl/dialog-add-server.tsx b/packages/app/src/wsl/dialog-add-server.tsx index 6600347d008..3c0b7ee35b8 100644 --- a/packages/app/src/wsl/dialog-add-server.tsx +++ b/packages/app/src/wsl/dialog-add-server.tsx @@ -82,9 +82,7 @@ export function DialogAddWslServer(props: DialogWslServerProps = {}) { - {controller.view() === "main" - ? language.t("wsl.server.add") - : language.t("wsl.onboarding.installDistro")} + {controller.view() === "main" ? language.t("wsl.server.add") : language.t("wsl.onboarding.installDistro")} @@ -144,7 +142,12 @@ export function DialogAddWslServer(props: DialogWslServerProps = {}) {
{language.t("wsl.onboarding.installedDistros")} - + {language.t("wsl.onboarding.checkAgain")}
@@ -436,11 +439,7 @@ function DialogWslSetup(props: { - + {language.t("wsl.onboarding.installWsl")} diff --git a/packages/app/src/wsl/settings-model.ts b/packages/app/src/wsl/settings-model.ts index 6d43e0a70dd..8a172e0574e 100644 --- a/packages/app/src/wsl/settings-model.ts +++ b/packages/app/src/wsl/settings-model.ts @@ -36,9 +36,7 @@ export type AddableProbePlan = { distros: string[] } -export type AutoProbePlan = - | { key: "runtime"; action: "probeRuntime" } - | { key: "distros"; action: "refreshDistros" } +export type AutoProbePlan = { key: "runtime"; action: "probeRuntime" } | { key: "distros"; action: "refreshDistros" } export type AddServerProbePlan = | { kind: "auto"; key: string; plan: AutoProbePlan } diff --git a/packages/desktop/src/main/wsl/servers.test.ts b/packages/desktop/src/main/wsl/servers.test.ts index 94cff52bfd3..35b688d3c86 100644 --- a/packages/desktop/src/main/wsl/servers.test.ts +++ b/packages/desktop/src/main/wsl/servers.test.ts @@ -1,5 +1,11 @@ import { expect, test } from "bun:test" -import { clearWslDistroState, requireWslIpcString, requireWslIpcStrings, wslServerIdToRestart, wslTerminalArgs } from "./policy" +import { + clearWslDistroState, + requireWslIpcString, + requireWslIpcStrings, + wslServerIdToRestart, + wslTerminalArgs, +} from "./policy" import { expectOpencodeVersion, pendingRestartAfterWslInstall, @@ -149,22 +155,18 @@ test("probes addable distros in parallel before checking OpenCode", async () => const started: string[] = [] const release = new Map void>() const opencode: string[] = [] - const controller = createWslServersController( - "1.16.2", - async () => new Promise(() => undefined), - { - ...testControllerOptions(), - probeDistro: async (distro) => { - started.push(distro) - await new Promise((resolve) => release.set(distro, resolve)) - return { name: distro, canExecute: true, hasBash: true, hasCurl: true, error: null } - }, - resolveOpencode: async (distro) => { - opencode.push(distro) - return "/home/me/.opencode/bin/opencode" - }, + const controller = createWslServersController("1.16.2", async () => new Promise(() => undefined), { + ...testControllerOptions(), + probeDistro: async (distro) => { + started.push(distro) + await new Promise((resolve) => release.set(distro, resolve)) + return { name: distro, canExecute: true, hasBash: true, hasCurl: true, error: null } }, - ) + resolveOpencode: async (distro) => { + opencode.push(distro) + return "/home/me/.opencode/bin/opencode" + }, + }) const task = controller.probeAddable(["Debian", "Ubuntu"]) await waitFor(() => started.length === 2) @@ -182,24 +184,20 @@ test("probes addable distros in parallel before checking OpenCode", async () => test("does not check OpenCode in addable distros that cannot execute commands", async () => { persistedServers = [] const opencode: string[] = [] - const controller = createWslServersController( - "1.16.2", - async () => new Promise(() => undefined), - { - ...testControllerOptions(), - probeDistro: async (distro) => ({ - name: distro, - canExecute: distro === "Debian", - hasBash: distro === "Debian", - hasCurl: distro === "Debian", - error: distro === "Debian" ? null : "Open Ubuntu once to finish setup", - }), - resolveOpencode: async (distro) => { - opencode.push(distro) - return "/home/me/.opencode/bin/opencode" - }, + const controller = createWslServersController("1.16.2", async () => new Promise(() => undefined), { + ...testControllerOptions(), + probeDistro: async (distro) => ({ + name: distro, + canExecute: distro === "Debian", + hasBash: distro === "Debian", + hasCurl: distro === "Debian", + error: distro === "Debian" ? null : "Open Ubuntu once to finish setup", + }), + resolveOpencode: async (distro) => { + opencode.push(distro) + return "/home/me/.opencode/bin/opencode" }, - ) + }) await controller.probeAddable(["Debian", "Ubuntu"])