systeminformation 5.23.3 → 5.23.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/system.js +15 -21
- package/package.json +1 -1
package/lib/system.js
CHANGED
|
@@ -473,11 +473,11 @@ function baseboard(callback) {
|
|
|
473
473
|
workload
|
|
474
474
|
).then((data) => {
|
|
475
475
|
let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
|
|
476
|
-
result.manufacturer = util.getValue(lines, 'Manufacturer');
|
|
477
|
-
result.model = util.getValue(lines, 'Product Name');
|
|
478
|
-
result.version = util.getValue(lines, 'Version');
|
|
479
|
-
result.serial = util.getValue(lines, 'Serial Number');
|
|
480
|
-
result.assetTag = util.getValue(lines, 'Asset Tag');
|
|
476
|
+
result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer'));
|
|
477
|
+
result.model = cleanDefaults(util.getValue(lines, 'Product Name'));
|
|
478
|
+
result.version = cleanDefaults(util.getValue(lines, 'Version'));
|
|
479
|
+
result.serial = cleanDefaults(util.getValue(lines, 'Serial Number'));
|
|
480
|
+
result.assetTag = cleanDefaults(util.getValue(lines, 'Asset Tag'));
|
|
481
481
|
// Non-Root values
|
|
482
482
|
const cmd = `echo -n "board_asset_tag: "; cat /sys/devices/virtual/dmi/id/board_asset_tag 2>/dev/null; echo;
|
|
483
483
|
echo -n "board_name: "; cat /sys/devices/virtual/dmi/id/board_name 2>/dev/null; echo;
|
|
@@ -486,16 +486,14 @@ function baseboard(callback) {
|
|
|
486
486
|
echo -n "board_version: "; cat /sys/devices/virtual/dmi/id/board_version 2>/dev/null; echo;`;
|
|
487
487
|
try {
|
|
488
488
|
lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
|
|
489
|
-
result.manufacturer = !result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer;
|
|
490
|
-
result.model = !result.model ? util.getValue(lines, 'board_name') : result.model;
|
|
491
|
-
result.version = !result.version ? util.getValue(lines, 'board_version') : result.version;
|
|
492
|
-
result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial;
|
|
493
|
-
result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag;
|
|
489
|
+
result.manufacturer = cleanDefaults(!result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer);
|
|
490
|
+
result.model = cleanDefaults(!result.model ? util.getValue(lines, 'board_name') : result.model);
|
|
491
|
+
result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version);
|
|
492
|
+
result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial);
|
|
493
|
+
result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag);
|
|
494
494
|
} catch (e) {
|
|
495
495
|
util.noop();
|
|
496
496
|
}
|
|
497
|
-
if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
|
|
498
|
-
if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
|
|
499
497
|
|
|
500
498
|
// mem
|
|
501
499
|
lines = data.results[1] ? data.results[1].toString().split('\n') : [''];
|
|
@@ -675,16 +673,12 @@ function chassis(callback) {
|
|
|
675
673
|
echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`;
|
|
676
674
|
exec(cmd, function (error, stdout) {
|
|
677
675
|
let lines = stdout.toString().split('\n');
|
|
678
|
-
result.manufacturer = util.getValue(lines, 'chassis_vendor');
|
|
676
|
+
result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
|
|
679
677
|
const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
|
|
680
|
-
result.type = (ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '';
|
|
681
|
-
result.version = util.getValue(lines, 'chassis_version');
|
|
682
|
-
result.serial = util.getValue(lines, 'chassis_serial');
|
|
683
|
-
result.assetTag = util.getValue(lines, 'chassis_asset_tag');
|
|
684
|
-
if (result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) { result.manufacturer = '-'; }
|
|
685
|
-
if (result.version.toLowerCase().indexOf('o.e.m.') !== -1) { result.version = '-'; }
|
|
686
|
-
if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
|
|
687
|
-
if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
|
|
678
|
+
result.type = cleanDefaults((ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '');
|
|
679
|
+
result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
|
|
680
|
+
result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
|
|
681
|
+
result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
|
|
688
682
|
|
|
689
683
|
if (callback) { callback(result); }
|
|
690
684
|
resolve(result);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "systeminformation",
|
|
3
|
-
"version": "5.23.
|
|
3
|
+
"version": "5.23.4",
|
|
4
4
|
"description": "Advanced, lightweight system and OS information library",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",
|