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

versions() fixed node version

Browse Source
This commit is contained in:
Sebastian Hildebrandt
2025-01-01 08:26:13 +01:00
parent 6d850386b7
commit dc714977c3
4 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/osinfo.js
+31 -14
View File
@@ -328,23 +328,23 @@ function osInfo(callback) {
result.build = util.getValue(lines, 'BuildVersion');
result.logofile = getLogoFile(result.distro);
result.codename = 'macOS';
result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename);
result.codename = (result.release.indexOf('10.5') > -1 ? 'Mac OS X Leopard' : result.codename);
result.codename = (result.release.indexOf('10.6') > -1 ? 'Mac OS X Snow Leopard' : result.codename);
result.codename = (result.release.indexOf('10.7') > -1 ? 'Mac OS X Lion' : result.codename);
result.codename = (result.release.indexOf('10.4') > -1 ? 'OS X Tiger' : result.codename);
result.codename = (result.release.indexOf('10.5') > -1 ? 'OS X Leopard' : result.codename);
result.codename = (result.release.indexOf('10.6') > -1 ? 'OS X Snow Leopard' : result.codename);
result.codename = (result.release.indexOf('10.7') > -1 ? 'OS X Lion' : result.codename);
result.codename = (result.release.indexOf('10.8') > -1 ? 'OS X Mountain Lion' : result.codename);
result.codename = (result.release.indexOf('10.9') > -1 ? 'OS X Mavericks' : result.codename);
result.codename = (result.release.indexOf('10.10') > -1 ? 'OS X Yosemite' : result.codename);
result.codename = (result.release.indexOf('10.11') > -1 ? 'OS X El Capitan' : result.codename);
result.codename = (result.release.indexOf('10.12') > -1 ? 'macOS Sierra' : result.codename);
result.codename = (result.release.indexOf('10.13') > -1 ? 'macOS High Sierra' : result.codename);
result.codename = (result.release.indexOf('10.14') > -1 ? 'macOS Mojave' : result.codename);
result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
result.codename = (result.release.startsWith('13.') ? 'macOS Ventura' : result.codename);
result.codename = (result.release.startsWith('14.') ? 'macOS Sonoma' : result.codename);
result.codename = (result.release.startsWith('15.') ? 'macOS Sequoia' : result.codename);
result.codename = (result.release.indexOf('10.12') > -1 ? 'Sierra' : result.codename);
result.codename = (result.release.indexOf('10.13') > -1 ? 'High Sierra' : result.codename);
result.codename = (result.release.indexOf('10.14') > -1 ? 'Mojave' : result.codename);
result.codename = (result.release.indexOf('10.15') > -1 ? 'Catalina' : result.codename);
result.codename = (result.release.startsWith('11.') ? 'Big Sur' : result.codename);
result.codename = (result.release.startsWith('12.') ? 'Monterey' : result.codename);
result.codename = (result.release.startsWith('13.') ? 'Ventura' : result.codename);
result.codename = (result.release.startsWith('14.') ? 'Sonoma' : result.codename);
result.codename = (result.release.startsWith('15.') ? 'Sequoia' : result.codename);
result.uefi = true;
result.codepage = util.getCodepage();
if (callback) {
@@ -467,7 +467,7 @@ function versions(apps, callback) {
mongodb: '',
mysql: '',
nginx: '',
node: process.versions.node,
node: '', //process.versions.node,
npm: '',
openssl: '',
perl: '',
@@ -799,6 +799,13 @@ function versions(apps, callback) {
if (!error) {
const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
} else {
exec('pg_config --version', function (error, stdout) {
if (!error) {
const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
}
});
}
functionProcessed();
});
@@ -1050,6 +1057,16 @@ function versions(apps, callback) {
functionProcessed();
});
}
if ({}.hasOwnProperty.call(appsObj.versions, 'node')) {
exec('node -v', function (error, stdout) {
if (!error) {
let line = stdout.toString().split('\n')[0].trim();
if (line.startsWith('v')) { line = line.slice(1); }
appsObj.versions.node = line;
}
functionProcessed();
});
}
if ({}.hasOwnProperty.call(appsObj.versions, 'powershell')) {
if (_windows) {
util.powerShell('$PSVersionTable').then(stdout => {