diff --git a/CHANGELOG.md b/CHANGELOG.md index 446b268..bcd8987 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -100,6 +100,7 @@ Other changes | Version | Date | Comment | | -------------- | -------------- | -------- | +| 3.45.8 | 2018-10-22 | `system()` fix Raspberry Pi detection | | 3.45.7 | 2018-10-05 | fixed typos | | 3.45.6 | 2018-09-12 | `mem()` bug parsing linux in other languages | | 3.45.5 | 2018-09-07 | `diskLayout()` tiny bug S.M.A.R.T status windows | diff --git a/lib/system.js b/lib/system.js index 02eb09a..4e1c72c 100644 --- a/lib/system.js +++ b/lib/system.js @@ -56,7 +56,7 @@ function system(callback) { if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-'; if (result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) result.manufacturer = ''; if (result.model.toLowerCase().indexOf('o.e.m.') !== -1) result.model = 'Computer'; - if (result.version.toLowerCase().indexOf('o.e.m.') !== -1) result.version = '-'; + if (result.version.toLowerCase().indexOf('o.e.m.') !== -1) result.version = ''; if (result.sku.toLowerCase().indexOf('o.e.m.') !== -1) result.sku = '-'; } // detect docker @@ -71,7 +71,7 @@ function system(callback) { if (lines.length > 0) result.model = 'Virtual machine'; } - if (result.manufacturer === '' && result.model === 'Computer' && result.version === '-') { + if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') { // Check Raspberry Pi exec('cat /proc/cpuinfo', function (error, stdout) { if (!error) { @@ -209,10 +209,10 @@ function system(callback) { } if (callback) { callback(result); } resolve(result); - }); + }); } catch (e) { if (callback) { callback(result); } - resolve(result); + resolve(result); } } }); @@ -289,13 +289,13 @@ function bios(callback) { } result.revision = util.getValue(lines, 'buildnumber', '='); } - + if (callback) { callback(result); } resolve(result); - }); + }); } catch (e) { if (callback) { callback(result); } - resolve(result); + resolve(result); } } }); @@ -364,7 +364,7 @@ function baseboard(callback) { exec(util.getWmic() + ' baseboard get /value', opts, function (error, stdout) { if (!error) { let lines = stdout.toString().split('\r\n'); - + result.manufacturer = util.getValue(lines, 'manufacturer', '='); result.model = util.getValue(lines, 'model', '='); if (!result.model) { @@ -377,13 +377,13 @@ function baseboard(callback) { result.assetTag = util.getValue(lines, 'sku', '='); } } - + if (callback) { callback(result); } resolve(result); - }); + }); } catch (e) { if (callback) { callback(result); } - resolve(result); + resolve(result); } } });