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

Respect PTYSHELL env variable if set

Browse Source 
Signed-off-by: Lauri Nevala <lauri.nevala@gmail.com>
This commit is contained in:
Lauri Nevala 2021-02-19 22:44:53 +02:00
parent 6dcf3ec668
commit 47f9bcaef0
2 changed files with 2 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

@ -105,7 +105,7 @@ export class ShellSession extends EventEmitter {
protected async getShellEnv() { protected async getShellEnv() {
const env = JSON.parse(JSON.stringify(await shellEnv())); const env = JSON.parse(JSON.stringify(await shellEnv()));
const pathStr = [this.kubectlBinDir, this.helmBinDir, process.env.PATH].join(path.delimiter); const pathStr = [this.kubectlBinDir, this.helmBinDir, process.env.PATH].join(path.delimiter);
const shell = userStore.preferences.shell || process.env.SHELL; const shell = userStore.preferences.shell || process.env.SHELL || process.env.PTYSHELL;
if(isWindows) { if(isWindows) {
env["SystemRoot"] = process.env.SystemRoot; env["SystemRoot"] = process.env.SystemRoot;

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

@ -134,7 +134,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} placeholder={process.env.SHELL || process.env.PTYSHELL}
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}