From 77c253594ffb3706d1c3d0139c42b5465b334b84 Mon Sep 17 00:00:00 2001 From: Eugene Pankov Date: Wed, 20 Feb 2019 00:04:06 +0100 Subject: [PATCH] don't offer separate wsl distros until Win 10 17763 (fixes #642) --- terminus-terminal/src/shells/wsl.ts | 3 ++- terminus-terminal/src/utils.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/terminus-terminal/src/shells/wsl.ts b/terminus-terminal/src/shells/wsl.ts index 0036a2dd..fd3395e9 100644 --- a/terminus-terminal/src/shells/wsl.ts +++ b/terminus-terminal/src/shells/wsl.ts @@ -6,6 +6,7 @@ import { Injectable } from '@angular/core' import { HostAppService, Platform } from 'terminus-core' import { ShellProvider, IShell } from '../api' +import { isWindowsBuild, WIN_BUILD_WSL_EXE_DISTRO_FLAG } from '../utils' @Injectable() export class WSLShellProvider extends ShellProvider { @@ -34,7 +35,7 @@ export class WSLShellProvider extends ShellProvider { }] let lxss = await Registry.get('HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Lxss', true) - if (!lxss || !lxss.$values.defaultdistribution) { + if (!lxss || !lxss.$values.defaultdistribution || !isWindowsBuild(WIN_BUILD_WSL_EXE_DISTRO_FLAG)) { if (await fs.exists(bashPath)) { return [{ id: 'wsl', diff --git a/terminus-terminal/src/utils.ts b/terminus-terminal/src/utils.ts index 53fb0c81..375b4351 100644 --- a/terminus-terminal/src/utils.ts +++ b/terminus-terminal/src/utils.ts @@ -2,6 +2,7 @@ import * as os from 'os' export const WIN_BUILD_CONPTY_SUPPORTED = 17692 export const WIN_BUILD_CONPTY_STABLE = 18309 +export const WIN_BUILD_WSL_EXE_DISTRO_FLAG = 17763 export function isWindowsBuild (build: number): boolean { return process.platform === 'win32' && parseFloat(os.release()) >= 10 && parseInt(os.release().split('.')[2]) >= build