mirror of
https://github.com/lensapp/lens.git
synced 2025-05-20 05:10:56 +00:00
Remove explicit side-effect from getting default shell
Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
parent
e2889c226b
commit
21f815bdea
@ -0,0 +1,24 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) OpenLens Authors. All rights reserved.
|
||||||
|
* Licensed under MIT License. See LICENSE in root directory for more information.
|
||||||
|
*/
|
||||||
|
import { getInjectable } from "@ogre-tools/injectable";
|
||||||
|
import isWindowsInjectable from "../../../common/vars/is-windows.injectable";
|
||||||
|
|
||||||
|
const defaultShellInjectable = getInjectable({
|
||||||
|
id: "default-shell",
|
||||||
|
|
||||||
|
instantiate: (di) => {
|
||||||
|
const isWindows = di.inject(isWindowsInjectable);
|
||||||
|
|
||||||
|
return (
|
||||||
|
process.env.SHELL ||
|
||||||
|
process.env.PTYSHELL ||
|
||||||
|
(isWindows ? "powershell.exe" : "System default shell")
|
||||||
|
);
|
||||||
|
},
|
||||||
|
|
||||||
|
causesSideEffects: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
export default defaultShellInjectable;
|
||||||
@ -8,7 +8,6 @@ import { observer } from "mobx-react";
|
|||||||
import type { UserStore } from "../../../common/user-store";
|
import type { UserStore } from "../../../common/user-store";
|
||||||
import { SubTitle } from "../layout/sub-title";
|
import { SubTitle } from "../layout/sub-title";
|
||||||
import { Input, InputValidators } from "../input";
|
import { Input, InputValidators } from "../input";
|
||||||
import { isWindows } from "../../../common/vars";
|
|
||||||
import { Switch } from "../switch";
|
import { Switch } from "../switch";
|
||||||
import { Select } from "../select";
|
import { Select } from "../select";
|
||||||
import type { ThemeStore } from "../../theme.store";
|
import type { ThemeStore } from "../../theme.store";
|
||||||
@ -16,21 +15,15 @@ import { Preferences } from "./preferences";
|
|||||||
import { withInjectables } from "@ogre-tools/injectable-react";
|
import { withInjectables } from "@ogre-tools/injectable-react";
|
||||||
import userStoreInjectable from "../../../common/user-store/user-store.injectable";
|
import userStoreInjectable from "../../../common/user-store/user-store.injectable";
|
||||||
import themeStoreInjectable from "../../theme-store.injectable";
|
import themeStoreInjectable from "../../theme-store.injectable";
|
||||||
|
import defaultShellInjectable from "./default-shell.injectable";
|
||||||
|
|
||||||
interface Dependencies {
|
interface Dependencies {
|
||||||
userStore: UserStore;
|
userStore: UserStore;
|
||||||
themeStore: ThemeStore;
|
themeStore: ThemeStore;
|
||||||
|
defaultShell: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const NonInjectedTerminal = observer(({ userStore, themeStore }: Dependencies) => {
|
const NonInjectedTerminal = observer(({ userStore, themeStore, defaultShell }: Dependencies) => {
|
||||||
const defaultShell = process.env.SHELL
|
|
||||||
|| process.env.PTYSHELL
|
|
||||||
|| (
|
|
||||||
isWindows
|
|
||||||
? "powershell.exe"
|
|
||||||
: "System default shell"
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Preferences data-testid="terminal-preferences-page">
|
<Preferences data-testid="terminal-preferences-page">
|
||||||
<section>
|
<section>
|
||||||
@ -102,6 +95,7 @@ export const Terminal = withInjectables<Dependencies>(
|
|||||||
getProps: (di) => ({
|
getProps: (di) => ({
|
||||||
userStore: di.inject(userStoreInjectable),
|
userStore: di.inject(userStoreInjectable),
|
||||||
themeStore: di.inject(themeStoreInjectable),
|
themeStore: di.inject(themeStoreInjectable),
|
||||||
|
defaultShell: di.inject(defaultShellInjectable),
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user