GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-06-12 23:49:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge env vars case insensitively (fixes #4778)

Browse Source
This commit is contained in:
Eugene Pankov 2021-10-23 10:04:44 +02:00
parent ff4b137088
commit 5c976948dd
No known key found for this signature in database
GPG Key ID: 5896FCBBDD1CF4F4
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tabby-local/src/session.ts
View File

@ -81,6 +81,20 @@ export class PTYProxy {
} }
} }
function mergeEnv (...envs) {
const result = {}
const keyMap = {}
for (const env of envs) {
for (const [key, value] of Object.entries(env)) {
// const lookup = process.platform === 'win32' ? key.toLowerCase() : key
const lookup = key.toLowerCase()
keyMap[lookup] ??= key
result[keyMap[lookup]] = value
}
}
return result
}
/** @hidden */ /** @hidden */
export class Session extends BaseSession { export class Session extends BaseSession {
private pty: PTYProxy|null = null private pty: PTYProxy|null = null
@ -108,22 +122,18 @@ export class Session extends BaseSession {
} }
if (!pty) { if (!pty) {
const env = { let env = mergeEnv(
...process.env, process.env,
{
TERM: 'xterm-256color', TERM: 'xterm-256color',
TERM_PROGRAM: 'Tabby', TERM_PROGRAM: 'Tabby',
...options.env, },
...this.config.store.terminal.environment || {}, options.env,
} this.config.store.terminal.environment || {},
)
if (this.hostApp.platform === Platform.Windows && this.config.store.terminal.setComSpec) { if (this.hostApp.platform === Platform.Windows && this.config.store.terminal.setComSpec) {
for (const k of Object.keys(env)) { env = mergeEnv(env, { COMSPEC: this.bootstrapData.executable })
if (k.toUpperCase() === 'COMSPEC') {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete env[k]
}
}
env.COMSPEC = this.bootstrapData.executable
} }
delete env[''] delete env['']