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

bugfix system() and flags() Raspberry Pi

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2018-05-13 19:12:21 +02:00
parent 0a40b9d160
commit b4bdc820d7
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cpu.js
+15 -15
View File
@@ -613,8 +613,19 @@ function cpuFlags(callback) {
}
});
}
if (callback) { callback(result); }
resolve(result);
if (!result) {
exec('cat /proc/cpuinfo', function (error, stdout) {
if (!error) {
let lines = stdout.toString().split('\n');
result = util.getValue(lines, 'features', ':', true).toLowerCase();
}
if (callback) { callback(result); }
resolve(result);
});
} else {
if (callback) { callback(result); }
resolve(result);
}
});
}
if (_freebsd || _openbsd) {
@@ -631,19 +642,8 @@ function cpuFlags(callback) {
});
}
result = flags.join(' ').trim();
if (!result) {
exec('cat /proc/cpuinfo', function (error, stdout) {
if (!error) {
let lines = stdout.toString().split('\n');
result = util.getValue(lines, 'features', ':', true).toLowerCase();
}
if (callback) { callback(result); }
resolve(result);
});
} else {
if (callback) { callback(result); }
resolve(result);
}
if (callback) { callback(result); }
resolve(result);
});
}
if (_darwin) {
lib/system.js
+5 -2
View File
@@ -63,8 +63,8 @@ function system(callback) {
if (fs.existsSync('/.dockerenv') || fs.existsSync('/.dockerinit')) {
result.model = 'Docker Container';
}
if (result.manufacturer === '' && result.model === 'Computer' && result.version === '-') { // still default values
exec('dmesg | grep -i virtual | grep -iE "vmware|qemu|kvm|xen"', function (error, stdout) {
if (result.manufacturer === '' && result.model === 'Computer' && result.version === '') { // still default values
exec('dmesg | grep -i virtual | grep -iE "vmware|qemu|kvm|xen"', function (error, stdout) {
// detect virtual machines
if (!error) {
let lines = stdout.toString().split('\n');
@@ -162,6 +162,9 @@ function system(callback) {
resolve(result);
}
});
} else {
if (callback) { callback(result); }
resolve(result);
}
});
}