code cleanup

This commit is contained in:
Sebastian Hildebrandt 2019-01-13 21:55:15 +01:00
parent 7c3e5f2c29
commit dbf35f2492

View File

@ -65,7 +65,7 @@ function system(callback) {
result.serial = result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial; result.serial = result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial;
result.uuid = result.uuid === '' ? util.getValue(lines, 'product_uuid') : result.uuid; result.uuid = result.uuid === '' ? util.getValue(lines, 'product_uuid') : result.uuid;
} catch (e) { } catch (e) {
util.noop();
} }
if (!result.serial || result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-'; if (!result.serial || result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-';
if (!result.manufacturer || result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) result.manufacturer = ''; if (!result.manufacturer || result.manufacturer.toLowerCase().indexOf('o.e.m.') !== -1) result.manufacturer = '';
@ -271,7 +271,7 @@ function bios(callback) {
datetime = util.getValue(lines, 'bios_date'); datetime = util.getValue(lines, 'bios_date');
result.releaseDate = !result.releaseDate ? util.parseDateTime(datetime).date : result.releaseDate; result.releaseDate = !result.releaseDate ? util.parseDateTime(datetime).date : result.releaseDate;
} catch (e) { } catch (e) {
util.noop();
} }
if (callback) { callback(result); } if (callback) { callback(result); }
resolve(result); resolve(result);
@ -368,7 +368,7 @@ function baseboard(callback) {
result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial; result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial;
result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag; result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag;
} catch (e) { } catch (e) {
util.noop();
} }
if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-'; if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-';
if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) result.assetTag = '-'; if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) result.assetTag = '-';
@ -453,7 +453,7 @@ function chassis(callback) {
'Peripheral Chassis', 'Peripheral Chassis',
'Storage Chassis', 'Storage Chassis',
'Rack Mount Chassis', 'Rack Mount Chassis',
'Sealed-Case PC'] 'Sealed-Case PC'];
return new Promise((resolve) => { return new Promise((resolve) => {
process.nextTick(() => { process.nextTick(() => {
@ -467,7 +467,6 @@ function chassis(callback) {
assetTag: '-', assetTag: '-',
sku: '', sku: '',
}; };
let cmd = '';
if (_linux || _freebsd || _openbsd) { if (_linux || _freebsd || _openbsd) {
const cmd = `echo -n "chassis_asset_tag: "; cat /sys/devices/virtual/dmi/id/chassis_asset_tag 2>&1; const cmd = `echo -n "chassis_asset_tag: "; cat /sys/devices/virtual/dmi/id/chassis_asset_tag 2>&1;
echo -n "chassis_serial: "; cat /sys/devices/virtual/dmi/id/chassis_serial 2>&1; echo -n "chassis_serial: "; cat /sys/devices/virtual/dmi/id/chassis_serial 2>&1;