From e1f03db3a19279188550f143bb9cd0f55f9810c9 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Sat, 9 Oct 2021 10:24:18 +0200 Subject: [PATCH] system() improved wsl version detection (WSL) --- lib/system.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/system.js b/lib/system.js index daa6b4c..bf33998 100644 --- a/lib/system.js +++ b/lib/system.js @@ -122,14 +122,12 @@ function system(callback) { util.noop(); } } - if (!result.virtual && (util.linuxVersion().toLowerCase().indexOf('microsoft') >= 0 || os.release().toLowerCase().indexOf('microsoft') >= 0 || os.release().toLowerCase().endsWith('wsl2'))) { - let versionStr = util.linuxVersion().toLowerCase(); - versionStr = versionStr.split('-')[0].replace('#', ''); - const version = os.release().toLowerCase().endsWith('wsl2') ? 'WSL2' : parseInt(versionStr, 10) || null; + if (!result.virtual && (os.release().toLowerCase().indexOf('microsoft') >= 0 || os.release().toLowerCase().endsWith('wsl2'))) { + const kernelVersion = parseFloat(os.release().toLowerCase()); result.virtual = true; result.manufacturer = 'Microsoft'; result.model = 'WSL'; - result.version = version; + result.version = kernelVersion < 4.19 ? '1' : '2'; } if ((_freebsd || _openbsd || _netbsd) && !result.virtualHost) { try {