hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fine tuning

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2021-02-23 09:42:05 +02:00
parent 47f9bcaef0
commit 4ec7b64c36
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/shell-session.ts
View File

@ -111,7 +111,7 @@ export class ShellSession extends EventEmitter {
env["SystemRoot"] = process.env.SystemRoot; env["SystemRoot"] = process.env.SystemRoot;
env["PTYSHELL"] = shell || "powershell.exe"; env["PTYSHELL"] = shell || "powershell.exe";
env["PATH"] = pathStr; env["PATH"] = pathStr;
} else if(typeof(shell) != "undefined") { } else if(shell !== undefined) {
env["PTYSHELL"] = shell; env["PTYSHELL"] = shell;
env["PATH"] = pathStr; env["PATH"] = pathStr;
} else { } else {

12
src/renderer/components/+preferences/preferences.tsx
View File

@ -6,6 +6,7 @@ import { action, computed, observable } from "mobx";
import { Icon } from "../icon"; import { Icon } from "../icon";
import { Select, SelectOption } from "../select"; import { Select, SelectOption } from "../select";
import { userStore } from "../../../common/user-store"; import { userStore } from "../../../common/user-store";
import { isWindows } from "../../../common/vars";
import { HelmRepo, repoManager } from "../../../main/helm/helm-repo-manager"; import { HelmRepo, repoManager } from "../../../main/helm/helm-repo-manager";
import { Input } from "../input"; import { Input } from "../input";
import { Checkbox } from "../checkbox"; import { Checkbox } from "../checkbox";
@ -110,6 +111,15 @@ export class Preferences extends React.Component {
render() { render() {
const { preferences } = userStore; const { preferences } = userStore;
const header = <h2>Preferences</h2>; const header = <h2>Preferences</h2>;
let defaultShell = process.env.SHELL || process.env.PTYSHELL;
if (!defaultShell) {
if (isWindows) {
defaultShell = "powershell.exe";
} else {
defaultShell = "System default shell";
}
}
return ( return (
<PageLayout showOnTop className="Preferences" header={header}> <PageLayout showOnTop className="Preferences" header={header}>
@ -134,7 +144,7 @@ export class Preferences extends React.Component {
<h2>Terminal Shell</h2> <h2>Terminal Shell</h2>
<Input <Input
theme="round-black" theme="round-black"
placeholder={process.env.SHELL || process.env.PTYSHELL} placeholder={defaultShell}
value={this.shell} value={this.shell}
onChange={v => this.shell = v} onChange={v => this.shell = v}
onBlur={() => preferences.shell = this.shell} onBlur={() => preferences.shell = this.shell}