From 34ccc760e4ae61cbd17b1d894cb10a8e4fbc3fc5 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 25 May 2016 10:55:46 -0700 Subject: [PATCH] Improve default terminals, make Windows %COMSPEC% Fixes #6886 --- src/vs/workbench/parts/terminal/common/terminal.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/vs/workbench/parts/terminal/common/terminal.ts b/src/vs/workbench/parts/terminal/common/terminal.ts index db52cf7b9cb..03f3fc5b1a1 100644 --- a/src/vs/workbench/parts/terminal/common/terminal.ts +++ b/src/vs/workbench/parts/terminal/common/terminal.ts @@ -6,16 +6,15 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -import path = require('path'); import platform = require('vs/base/common/platform'); export const TERMINAL_PANEL_ID = 'workbench.panel.terminal'; export const TERMINAL_SERVICE_ID = 'terminalService'; -export const TERMINAL_DEFAULT_SHELL_LINUX = process.env.SHELL || 'sh'; -export const TERMINAL_DEFAULT_SHELL_OSX = process.env.SHELL || 'sh'; -export const TERMINAL_DEFAULT_SHELL_WINDOWS = platform.isWindows ? path.resolve(process.env.SystemRoot, 'System32', 'WindowsPowerShell', 'v1.0', 'powershell.exe') : ''; +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 var ITerminalService = createDecorator(TERMINAL_SERVICE_ID); -- GitLab