From a2d4a292d4acd455c26fb8f153578970ed888453 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 25 May 2016 12:51:16 -0700 Subject: [PATCH] Simplify default windows shell fetching --- src/vs/workbench/parts/terminal/common/terminal.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index 5b88a9a678f..4b83fba228e 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -7,6 +7,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import platform = require('vs/base/common/platform'); +import processes = require('vs/base/node/processes'); export const TERMINAL_PANEL_ID = 'workbench.panel.terminal'; @@ -14,7 +15,7 @@ export const TERMINAL_SERVICE_ID = 'terminalService'; export const TERMINAL_DEFAULT_SHELL_LINUX = !platform.isWindows ? (process.env.SHELL || 'sh') : 'sh'; export const TERMINAL_DEFAULT_SHELL_OSX = !platform.isWindows ? (process.env.SHELL || 'sh') : 'sh'; -export const TERMINAL_DEFAULT_SHELL_WINDOWS = platform.isWindows ? (process.env.COMSPEC || 'cmd.exe') : 'cmd.exe'; +export const TERMINAL_DEFAULT_SHELL_WINDOWS = processes.getWindowsShell(); export var ITerminalService = createDecorator(TERMINAL_SERVICE_ID); -- GitLab