systeminformation 5.24.1 → 5.24.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/lib/osinfo.js +31 -14
  2. package/package.json +1 -1
package/lib/osinfo.js CHANGED
@@ -328,23 +328,23 @@ function osInfo(callback) {
328
328
  result.build = util.getValue(lines, 'BuildVersion');
329
329
  result.logofile = getLogoFile(result.distro);
330
330
  result.codename = 'macOS';
331
- result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename);
332
- result.codename = (result.release.indexOf('10.5') > -1 ? 'Mac OS X Leopard' : result.codename);
333
- result.codename = (result.release.indexOf('10.6') > -1 ? 'Mac OS X Snow Leopard' : result.codename);
334
- result.codename = (result.release.indexOf('10.7') > -1 ? 'Mac OS X Lion' : result.codename);
331
+ result.codename = (result.release.indexOf('10.4') > -1 ? 'OS X Tiger' : result.codename);
332
+ result.codename = (result.release.indexOf('10.5') > -1 ? 'OS X Leopard' : result.codename);
333
+ result.codename = (result.release.indexOf('10.6') > -1 ? 'OS X Snow Leopard' : result.codename);
334
+ result.codename = (result.release.indexOf('10.7') > -1 ? 'OS X Lion' : result.codename);
335
335
  result.codename = (result.release.indexOf('10.8') > -1 ? 'OS X Mountain Lion' : result.codename);
336
336
  result.codename = (result.release.indexOf('10.9') > -1 ? 'OS X Mavericks' : result.codename);
337
337
  result.codename = (result.release.indexOf('10.10') > -1 ? 'OS X Yosemite' : result.codename);
338
338
  result.codename = (result.release.indexOf('10.11') > -1 ? 'OS X El Capitan' : result.codename);
339
- result.codename = (result.release.indexOf('10.12') > -1 ? 'macOS Sierra' : result.codename);
340
- result.codename = (result.release.indexOf('10.13') > -1 ? 'macOS High Sierra' : result.codename);
341
- result.codename = (result.release.indexOf('10.14') > -1 ? 'macOS Mojave' : result.codename);
342
- result.codename = (result.release.indexOf('10.15') > -1 ? 'macOS Catalina' : result.codename);
343
- result.codename = (result.release.startsWith('11.') ? 'macOS Big Sur' : result.codename);
344
- result.codename = (result.release.startsWith('12.') ? 'macOS Monterey' : result.codename);
345
- result.codename = (result.release.startsWith('13.') ? 'macOS Ventura' : result.codename);
346
- result.codename = (result.release.startsWith('14.') ? 'macOS Sonoma' : result.codename);
347
- result.codename = (result.release.startsWith('15.') ? 'macOS Sequoia' : result.codename);
339
+ result.codename = (result.release.indexOf('10.12') > -1 ? 'Sierra' : result.codename);
340
+ result.codename = (result.release.indexOf('10.13') > -1 ? 'High Sierra' : result.codename);
341
+ result.codename = (result.release.indexOf('10.14') > -1 ? 'Mojave' : result.codename);
342
+ result.codename = (result.release.indexOf('10.15') > -1 ? 'Catalina' : result.codename);
343
+ result.codename = (result.release.startsWith('11.') ? 'Big Sur' : result.codename);
344
+ result.codename = (result.release.startsWith('12.') ? 'Monterey' : result.codename);
345
+ result.codename = (result.release.startsWith('13.') ? 'Ventura' : result.codename);
346
+ result.codename = (result.release.startsWith('14.') ? 'Sonoma' : result.codename);
347
+ result.codename = (result.release.startsWith('15.') ? 'Sequoia' : result.codename);
348
348
  result.uefi = true;
349
349
  result.codepage = util.getCodepage();
350
350
  if (callback) {
@@ -467,7 +467,7 @@ function versions(apps, callback) {
467
467
  mongodb: '',
468
468
  mysql: '',
469
469
  nginx: '',
470
- node: process.versions.node,
470
+ node: '', //process.versions.node,
471
471
  npm: '',
472
472
  openssl: '',
473
473
  perl: '',
@@ -799,6 +799,13 @@ function versions(apps, callback) {
799
799
  if (!error) {
800
800
  const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
801
801
  appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
802
+ } else {
803
+ exec('pg_config --version', function (error, stdout) {
804
+ if (!error) {
805
+ const postgresql = stdout.toString().split('\n')[0].split(' ') || [];
806
+ appsObj.versions.postgresql = postgresql.length ? postgresql[postgresql.length - 1] : '';
807
+ }
808
+ });
802
809
  }
803
810
  functionProcessed();
804
811
  });
@@ -1050,6 +1057,16 @@ function versions(apps, callback) {
1050
1057
  functionProcessed();
1051
1058
  });
1052
1059
  }
1060
+ if ({}.hasOwnProperty.call(appsObj.versions, 'node')) {
1061
+ exec('node -v', function (error, stdout) {
1062
+ if (!error) {
1063
+ let line = stdout.toString().split('\n')[0].trim();
1064
+ if (line.startsWith('v')) { line = line.slice(1); }
1065
+ appsObj.versions.node = line;
1066
+ }
1067
+ functionProcessed();
1068
+ });
1069
+ }
1053
1070
  if ({}.hasOwnProperty.call(appsObj.versions, 'powershell')) {
1054
1071
  if (_windows) {
1055
1072
  util.powerShell('$PSVersionTable').then(stdout => {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "systeminformation",
3
- "version": "5.24.1",
3
+ "version": "5.24.2",
4
4
  "description": "Advanced, lightweight system and OS information library",
5
5
  "license": "MIT",
6
6
  "author": "Sebastian Hildebrandt <hildebrandt@plus-innovations.com> (https://plus-innovations.com)",