diff --git a/CHANGELOG.md b/CHANGELOG.md index 28ff10c..a3aef17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.24.2 | 2025-01-01 | `versions()` fixed node version | | 5.24.1 | 2024-12-31 | `versions()` fixed deno and bun | | 5.24.0 | 2024-12-31 | `versions()` added deno and bun | | 5.23.25 | 2024-12-30 | `system()` adapted model and version (macOS) | diff --git a/docs/history.html b/docs/history.html index 03ef5c4..b0bfac8 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@ + + 5.24.2 + 2025-01-01 + versions() fixed node version + 5.24.1 2024-12-31 diff --git a/docs/index.html b/docs/index.html index 7eb02b3..bd801ba 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.24.1
+
New Version: 5.24.2
diff --git a/lib/osinfo.js b/lib/osinfo.js index ddb804a..eefedc3 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -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 => {