diff --git a/lib/network.js b/lib/network.js index 00d1deb..ed130be 100644 --- a/lib/network.js +++ b/lib/network.js @@ -337,8 +337,12 @@ function networkInterfaces(callback) { echo -n "type: "; cat /sys/class/net/${iface}/type 2>&1; echo -n "wireless: "; cat /proc/net/wireless \| grep ${iface}; echo -n "wirelessspeed: "; iw dev ${iface} link 2>&1 \| grep bitrate; echo;`; + let lines = []; + try { + lines = execSync(cmd).toString().split('\n'); + } catch (e) { - let lines = execSync(cmd).toString().split('\n'); + } duplex = util.getValue(lines, 'duplex'); duplex = duplex.startsWith('cat') ? '' : duplex; mtu = parseInt(util.getValue(lines, 'mtu'), 10); diff --git a/lib/system.js b/lib/system.js index f044426..75c7a1a 100644 --- a/lib/system.js +++ b/lib/system.js @@ -57,12 +57,16 @@ function system(callback) { echo -n "product_uuid: "; cat /sys/devices/virtual/dmi/id/product_uuid 2>&1; echo -n "product_version: "; cat /sys/devices/virtual/dmi/id/product_version 2>&1; echo -n "sys_vendor: "; cat /sys/devices/virtual/dmi/id/sys_vendor 2>&1;`; - lines = execSync(cmd).toString().split('\n'); - result.manufacturer = result.manufacturer === '' ? util.getValue(lines, 'sys_vendor') : result.manufacturer; - result.model = result.model === '' ? util.getValue(lines, 'product_name') : result.model; - result.version = result.version === '' ? util.getValue(lines, 'product_version') : result.version; - result.serial = result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial; - result.uuid = result.uuid === '' ? util.getValue(lines, 'product_uuid') : result.uuid; + try { + lines = execSync(cmd).toString().split('\n'); + result.manufacturer = result.manufacturer === '' ? util.getValue(lines, 'sys_vendor') : result.manufacturer; + result.model = result.model === '' ? util.getValue(lines, 'product_name') : result.model; + result.version = result.version === '' ? util.getValue(lines, 'product_version') : result.version; + result.serial = result.serial === '' ? util.getValue(lines, 'product_serial') : result.serial; + result.uuid = result.uuid === '' ? util.getValue(lines, 'product_uuid') : result.uuid; + } catch (e) { + + } 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.model || result.model.toLowerCase().indexOf('o.e.m.') !== -1) result.model = 'Computer'; @@ -260,12 +264,15 @@ function bios(callback) { const cmd = `echo -n "bios_date: "; cat /sys/devices/virtual/dmi/id/bios_date 2>&1; echo -n "bios_vendor: "; cat /sys/devices/virtual/dmi/id/bios_vendor 2>&1; echo -n "bios_version: "; cat /sys/devices/virtual/dmi/id/bios_version 2>&1;`; - lines = execSync(cmd).toString().split('\n'); - result.vendor = !result.vendor ? util.getValue(lines, 'bios_vendor') : result.vendor; - result.version = !result.version ? util.getValue(lines, 'bios_version') : result.version; - datetime = util.getValue(lines, 'bios_date'); - result.releaseDate = !result.releaseDate ? util.parseDateTime(datetime).date : result.releaseDate; + try { + lines = execSync(cmd).toString().split('\n'); + result.vendor = !result.vendor ? util.getValue(lines, 'bios_vendor') : result.vendor; + result.version = !result.version ? util.getValue(lines, 'bios_version') : result.version; + datetime = util.getValue(lines, 'bios_date'); + result.releaseDate = !result.releaseDate ? util.parseDateTime(datetime).date : result.releaseDate; + } catch (e) { + } if (callback) { callback(result); } resolve(result); }); @@ -353,12 +360,16 @@ function baseboard(callback) { echo -n "board_serial: "; cat /sys/devices/virtual/dmi/id/board_serial 2>&1; echo -n "board_vendor: "; cat /sys/devices/virtual/dmi/id/board_vendor 2>&1; echo -n "board_version: "; cat /sys/devices/virtual/dmi/id/board_version 2>&1;`; - lines = execSync(cmd).toString().split('\n'); - result.manufacturer = !result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer; - result.model = !result.model ? util.getValue(lines, 'board_name') : result.model; - result.version = !result.version ? util.getValue(lines, 'board_version') : result.version; - result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial; - result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag; + try { + lines = execSync(cmd).toString().split('\n'); + result.manufacturer = !result.manufacturer ? util.getValue(lines, 'board_vendor') : result.manufacturer; + result.model = !result.model ? util.getValue(lines, 'board_name') : result.model; + result.version = !result.version ? util.getValue(lines, 'board_version') : result.version; + result.serial = !result.serial ? util.getValue(lines, 'board_serial') : result.serial; + result.assetTag = !result.assetTag ? util.getValue(lines, 'board_asset_tag') : result.assetTag; + } catch (e) { + + } if (result.serial.toLowerCase().indexOf('o.e.m.') !== -1) result.serial = '-'; if (result.assetTag.toLowerCase().indexOf('o.e.m.') !== -1) result.assetTag = '-';