diff --git a/src/main/shell-session/shell-session.ts b/src/main/shell-session/shell-session.ts index 523ab6176f..1f58903035 100644 --- a/src/main/shell-session/shell-session.ts +++ b/src/main/shell-session/shell-session.ts @@ -189,7 +189,9 @@ export abstract class ShellSession { } catch {} } - return env.HOME; + return isWindows + ? env.USERPROFILE + : env.HOME; } protected async openShellProcess(shell: string, args: string[], env: Record) { diff --git a/src/renderer/components/cluster-settings/cluster-settings.tsx b/src/renderer/components/cluster-settings/cluster-settings.tsx index 6c35c1bbc8..762d0789fc 100644 --- a/src/renderer/components/cluster-settings/cluster-settings.tsx +++ b/src/renderer/components/cluster-settings/cluster-settings.tsx @@ -79,7 +79,7 @@ export function TerminalSettings({ entity }: EntitySettingViewProps) { return (
- +
); } diff --git a/src/renderer/components/cluster-settings/components/cluster-home-dir-setting.tsx b/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx similarity index 96% rename from src/renderer/components/cluster-settings/components/cluster-home-dir-setting.tsx rename to src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx index 001793f662..99c993ab1f 100644 --- a/src/renderer/components/cluster-settings/components/cluster-home-dir-setting.tsx +++ b/src/renderer/components/cluster-settings/components/cluster-local-terminal-settings.tsx @@ -30,13 +30,14 @@ import { Notifications } from "../../notifications"; import { resolveTilde } from "../../../utils"; import { Icon } from "../../icon"; import { PathPicker } from "../../path-picker"; +import { isWindows } from "../../../../common/vars"; interface Props { cluster: Cluster; } @observer -export class ClusterHomeDirSetting extends React.Component { +export class ClusterLocalTerminalSetting extends React.Component { @observable directory = ""; @observable defaultNamespace = ""; @@ -140,7 +141,7 @@ export class ClusterHomeDirSetting extends React.Component { value={this.directory} onChange={this.onChangeTerminalCWD} onBlur={this.saveCWD} - placeholder="$HOME" + placeholder={isWindows ? "$USERPROFILE" : "$HOME"} iconRight={ <> { diff --git a/src/renderer/components/cluster-settings/components/index.ts b/src/renderer/components/cluster-settings/components/index.ts index beb80269b7..55a1340ced 100644 --- a/src/renderer/components/cluster-settings/components/index.ts +++ b/src/renderer/components/cluster-settings/components/index.ts @@ -20,7 +20,7 @@ */ export * from "./cluster-accessible-namespaces"; -export * from "./cluster-home-dir-setting"; +export * from "./cluster-local-terminal-settings"; export * from "./cluster-kubeconfig"; export * from "./cluster-metrics-setting"; export * from "./cluster-name-setting";