Mirrors/tabby
2
0
Fork 0
mirror of https://github.com/Eugeny/tabby synced 2024-12-13 14:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

make comspec setting optional - fixes #4143

Browse source
This commit is contained in:
Eugene Pankov 2021-07-06 19:03:34 +02:00
parent 41a53a3e8e
commit d3498a6a46
4 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
tabby-core/src/services/config.service.ts
View file

@ -263,6 +263,7 @@ export class ConfigService {
config.version = 1
}
if (config.version < 2) {
config.profiles ??= []
if (config.terminal?.recoverTabs !== undefined) {
config.recoverTabs = config.terminal.recoverTabs
delete config.terminal.recoverTabs

1
tabby-local/src/config.ts
View file

@ -15,6 +15,7 @@ export class TerminalConfigProvider extends ConfigProvider {
showBuiltinProfiles: true,
environment: {},
profiles: [],
setComSpec: false,
},
}

8
tabby-local/src/session.ts
View file

@ -122,7 +122,13 @@ export class Session extends BaseSession {
...this.config.store.terminal.environment || {},
}
if (this.hostApp.platform === Platform.Windows) {
if (this.hostApp.platform === Platform.Windows && this.config.store.terminal.setComSpec) {
for (const k of Object.keys(env)) {
if (k.toUpperCase() === 'COMSPEC') {
// eslint-disable-next-line @typescript-eslint/no-dynamic-delete
delete env[k]
}
}
env.COMSPEC = this.bootstrapData.executable
}

9
tabby-terminal/src/components/terminalSettingsTab.component.pug
View file

@ -158,3 +158,12 @@ h3.mb-3 Terminal
[(ngModel)]='config.store.terminal.warnOnMultilinePaste',
(ngModelChange)='config.save()',
)
.form-line(*ngIf='hostApp.platform === Platform.Windows')
.header
.title Set Tabby as %COMSPEC%
.description Allows opening .bat files in tabs, but breaks some shells
toggle(
[(ngModel)]='config.store.terminal.setComSpec',
(ngModelChange)='config.save()',
)