mike/systeminformation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

baseboard(), chassis() cleaned defauls (linux)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2024-08-06 16:41:52 +02:00
parent a08032866a
commit 86f54c0d03
1 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/system.js
View File

@ -473,11 +473,11 @@ function baseboard(callback) {
workload workload
).then((data) => { ).then((data) => {
let lines = data.results[0] ? data.results[0].toString().split('\n') : ['']; let lines = data.results[0] ? data.results[0].toString().split('\n') : [''];
result.manufacturer = util.getValue(lines, 'Manufacturer'); result.manufacturer = cleanDefaults(util.getValue(lines, 'Manufacturer'));
result.model = util.getValue(lines, 'Product Name'); result.model = cleanDefaults(util.getValue(lines, 'Product Name'));
result.version = util.getValue(lines, 'Version'); result.version = cleanDefaults(util.getValue(lines, 'Version'));
result.serial = util.getValue(lines, 'Serial Number'); result.serial = cleanDefaults(util.getValue(lines, 'Serial Number'));
result.assetTag = util.getValue(lines, 'Asset Tag'); result.assetTag = cleanDefaults(util.getValue(lines, 'Asset Tag'));
// Non-Root values // Non-Root values
const cmd = `echo -n "board_asset_tag: "; cat /sys/devices/virtual/dmi/id/board_asset_tag 2>/dev/null; echo; const cmd = `echo -n "board_asset_tag: "; cat /sys/devices/virtual/dmi/id/board_asset_tag 2>/dev/null; echo;
echo -n "board_name: "; cat /sys/devices/virtual/dmi/id/board_name 2>/dev/null; echo; echo -n "board_name: "; cat /sys/devices/virtual/dmi/id/board_name 2>/dev/null; echo;
@ -486,16 +486,14 @@ function baseboard(callback) {
echo -n "board_version: "; cat /sys/devices/virtual/dmi/id/board_version 2>/dev/null; echo;`; echo -n "board_version: "; cat /sys/devices/virtual/dmi/id/board_version 2>/dev/null; echo;`;
try { try {
lines = execSync(cmd, util.execOptsLinux).toString().split('\n'); lines = execSync(cmd, util.execOptsLinux).toString().split('\n');
result.manufacturer = !result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer; result.manufacturer = cleanDefaults(!result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer);
result.model = !result.model ? util.getValue(lines, 'board_name') : result.model; result.model = cleanDefaults(!result.model ? util.getValue(lines, 'board_name') : result.model);
result.version = !result.version ? util.getValue(lines, 'board_version') : result.version; result.version = cleanDefaults(!result.version ? util.getValue(lines, 'board_version') : result.version);
result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial; result.serial = cleanDefaults(!result.serial ? util.getValue(lines, 'board_serial') : result.serial);
result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag; result.assetTag = cleanDefaults(!result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag);
} catch (e) { } catch (e) {
util.noop(); util.noop();
} }
if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
// mem // mem
lines = data.results[1] ? data.results[1].toString().split('\n') : ['']; lines = data.results[1] ? data.results[1].toString().split('\n') : [''];
@ -675,16 +673,12 @@ function chassis(callback) {
echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`; echo -n "chassis_version: "; cat /sys/devices/virtual/dmi/id/chassis_version 2>/dev/null; echo;`;
exec(cmd, function (error, stdout) { exec(cmd, function (error, stdout) {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
result.manufacturer = util.getValue(lines, 'chassis_vendor'); result.manufacturer = cleanDefaults(util.getValue(lines, 'chassis_vendor'));
const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, '')); const ctype = parseInt(util.getValue(lines, 'chassis_type').replace(/\D/g, ''));
result.type = (ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : ''; result.type = cleanDefaults((ctype && !isNaN(ctype) && ctype < chassisTypes.length) ? chassisTypes[ctype - 1] : '');
result.version = util.getValue(lines, 'chassis_version'); result.version = cleanDefaults(util.getValue(lines, 'chassis_version'));
result.serial = util.getValue(lines, 'chassis_serial'); result.serial = cleanDefaults(util.getValue(lines, 'chassis_serial'));
result.assetTag = util.getValue(lines, 'chassis_asset_tag'); result.assetTag = cleanDefaults(util.getValue(lines, 'chassis_asset_tag'));
if (result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) { result.manufacturer = '-'; }
if (result.version.toLowerCase().indexOf('o.e.m.') !== -1) { result.version = '-'; }
if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) { result.serial = '-'; }
if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) { result.assetTag = '-'; }
if (callback) { callback(result); } if (callback) { callback(result); }
resolve(result); resolve(result);