From ec5aa8d473652652b9dad5619c11e41d6a32d7e9 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Tue, 8 May 2018 21:23:44 +0200 Subject: [PATCH] bugfix system.sku (windows) --- lib/system.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/system.js b/lib/system.js index 1e41031..0886d0b 100644 --- a/lib/system.js +++ b/lib/system.js @@ -168,8 +168,6 @@ function system(callback) { resolve(result); } if (_windows) { - // exec('wmic csproduct get', function (error, stdout) { - // TODO: refactor /value exec(util.getWmic() + ' csproduct get /value', opts, function (error, stdout) { if (!error) { // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/); @@ -179,7 +177,14 @@ function system(callback) { result.version = util.getValue(lines, 'version', '='); result.serial = util.getValue(lines, 'identifyingnumber', '='); result.uuid = util.getValue(lines, 'uuid', '='); - result.sku = util.getValue(lines, 'skunumber', '='); + exec(util.getWmic() + ' /namespace:\\\\root\\wmi path MS_SystemInformation get /value', opts, function (error, stdout) { + if (!error) { + let lines = stdout.split('\r\n'); + result.sku = util.getValue(lines, 'systemsku', '='); + } + if (callback) { callback(result); } + resolve(result); + }); } if (callback) { callback(result); } resolve(result); @@ -249,7 +254,7 @@ function bios(callback) { } result.releaseDate = util.getValue(lines, 'releasedate', '='); if (result.releaseDate.length >= 10) { - result.releaseDate = result.releaseDate.substr(0,4) + '-' + result.releaseDate.substr(4,2) + '-' + result.releaseDate.substr(6,2); + result.releaseDate = result.releaseDate.substr(0, 4) + '-' + result.releaseDate.substr(4, 2) + '-' + result.releaseDate.substr(6, 2); } result.revision = util.getValue(lines, 'buildnumber', '='); } @@ -316,7 +321,6 @@ function baseboard(callback) { }); } if (_windows) { - // TODO: check BIOS windows exec(util.getWmic() + ' baseboard get /value', opts, function (error, stdout) { if (!error) { let lines = stdout.toString().split('\r\n');