From 52d14dae63551b5a37d954e9fc448f9c6b89166e Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Mon, 9 Oct 2017 20:14:11 -0700
Subject: [PATCH] Correct condition

---
 .../workbench/parts/terminal/electron-browser/terminal.ts | 7 ++++---
 .../test/electron-browser/terminalConfigHelper.test.ts    | 8 ++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
index 48da0534572..e91d9b86fda 100644
--- a/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
+++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.ts
@@ -24,13 +24,14 @@ export interface ITerminalProcessFactory {
 }
 
 if (platform.isLinux) {
-	fileExists('/etc/os-release').then(exists => {
+	const file = '/etc/os-release';
+	fileExists(file).then(exists => {
 		if (!exists) {
 			return;
 		}
-		readFile('/etc/os-release').then(b => {
+		readFile(file).then(b => {
 			const contents = b.toString();
-			if (contents.indexOf('NAME=Fedora')) {
+			if (contents.indexOf('NAME=Fedora') >= 0) {
 				isFedora = true;
 			}
 		});
diff --git a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
index e95533d078f..3eecd534b8c 100644
--- a/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
+++ b/src/vs/workbench/parts/terminal/test/electron-browser/terminalConfigHelper.test.ts
@@ -11,7 +11,7 @@ import { Platform } from 'vs/base/common/platform';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { TerminalConfigHelper } from 'vs/workbench/parts/terminal/electron-browser/terminalConfigHelper';
 import { EDITOR_FONT_DEFAULTS } from 'vs/editor/common/config/editorOptions';
-
+import { isFedora } from 'vs/workbench/parts/terminal/electron-browser/terminal';
 
 class MockConfigurationService implements IConfigurationService {
 	public _serviceBrand: any;
@@ -63,7 +63,11 @@ suite('Workbench - TerminalConfigHelper', () => {
 		});
 		configHelper = new TerminalConfigHelper(Platform.Linux, configurationService, null, null, null);
 		configHelper.panelContainer = fixture;
-		assert.equal(configHelper.getFont().fontFamily, 'foo', 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
+		if (isFedora) {
+			assert.equal(configHelper.getFont().fontFamily, '\'DejaVu Sans Mono\'', 'Fedora should have its font overridden when terminal.integrated.fontFamily not set');
+		} else {
+			assert.equal(configHelper.getFont().fontFamily, 'foo', 'editor.fontFamily should be the fallback when terminal.integrated.fontFamily not set');
+		}
 	});
 
 	test('TerminalConfigHelper - getFont fontSize', function () {
-- 
GitLab