GuanM/tabby
1
0
Fork 0
mirror of https://github.com/Eugeny/tabby.git synced 2025-08-06 09:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash for unknown wsl distros (fixes #2083, fixes #2021)

Browse Source
This commit is contained in:
Eugene Pankov
2020-02-05 14:25:14 +03:00
parent 26ee36458d
commit bfd34df41e
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
terminus-terminal/src/shells/wsl.ts
View File

@@ -16,16 +16,19 @@ try {
// WSL Distribution List // WSL Distribution List
// https://docs.microsoft.com/en-us/windows/wsl/install-win10#install-your-linux-distribution-of-choice // https://docs.microsoft.com/en-us/windows/wsl/install-win10#install-your-linux-distribution-of-choice
/* eslint-disable quote-props */
var wslIconMap: { [key: string]: string } = { var wslIconMap: { [key: string]: string } = {
'Alpine': 'alpine.svg', 'Alpine': require('../icons/alpine.svg'),
'Debian': 'debian.svg', 'Debian': require('../icons/debian.svg'),
'kali-linux': 'linux.svg', 'kali-linux': require('../icons/linux.svg'),
'SLES-12': 'suse.svg', 'SLES-12': require('../icons/suse.svg'),
'openSUSE-Leap-15-1': 'suse.svg', 'openSUSE-Leap-15-1': require('../icons/suse.svg'),
'Ubuntu-18.04': 'ubuntu.svg', 'Ubuntu-16.04': require('../icons/ubuntu.svg'),
'Ubuntu': 'ubuntu.svg', 'Ubuntu-18.04': require('../icons/ubuntu.svg'),
'Linux': 'linux.svg', 'Ubuntu': require('../icons/ubuntu.svg'),
'Linux': require('../icons/linux.svg'),
} }
/* eslint-enable quote-props */
/** @hidden */ /** @hidden */
@Injectable() @Injectable()
@@ -59,9 +62,7 @@ export class WSLShellProvider extends ShellProvider {
TERM: 'xterm-color', TERM: 'xterm-color',
COLORTERM: 'truecolor', COLORTERM: 'truecolor',
}, },
} icon: wslIconMap[defaultDistKey.DistributionName.value],
if (wslIconMap.hasOwnProperty(defaultDistKey.DistributionName.value)) {
shell['icon'] = require(`../icons/${wslIconMap[defaultDistKey.DistributionName.value]}`)
} }
shells.push(shell) shells.push(shell)
} }
@@ -72,7 +73,7 @@ export class WSLShellProvider extends ShellProvider {
return [{ return [{
id: 'wsl', id: 'wsl',
name: 'WSL / Bash on Windows', name: 'WSL / Bash on Windows',
icon: require(`../icons/${wslIconMap['linux']}`), icon: wslIconMap['Linux'],
command: bashPath, command: bashPath,
env: { env: {
TERM: 'xterm-color', TERM: 'xterm-color',