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

tests: added node 19

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2022-11-03 10:27:23 +01:00
parent 582a2c8652
commit 7a525d006c
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
os: [ubuntu-latest] os: [ubuntu-latest]
node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x] node-version: [10.x, 11.x, 12.x, 13.x, 14.x, 15.x, 16.x, 17.x, 18.x, 19.x]
include: include:
- os: macos-latest - os: macos-latest
node-version: 14.x node-version: 14.x

14
lib/memory.js
View File

@ -245,13 +245,13 @@ function mem(callback) {
if (!error) { if (!error) {
let lines = stdout.toString().split('\n'); let lines = stdout.toString().split('\n');
if (lines.length > 0) { if (lines.length > 0) {
let line = lines[0].replace(/,/g, '.').replace(/M/g, ''); let firstline = lines[0].replace(/,/g, '.').replace(/M/g, '');
line = line.trim().split(' '); let lineArray = firstline.trim().split(' ');
for (let i = 0; i < line.length; i++) { lineArray.forEach(line => {
if (line[i].toLowerCase().indexOf('total') !== -1) { result.swaptotal = parseFloat(line[i].split('=')[1].trim()) * 1024 * 1024; } if (line.toLowerCase().indexOf('total') !== -1) { result.swaptotal = parseFloat(line.split('=')[1].trim()) * 1024 * 1024; }
if (line[i].toLowerCase().indexOf('used') !== -1) { result.swapused = parseFloat(line[i].split('=')[1].trim()) * 1024 * 1024; } if (line.toLowerCase().indexOf('used') !== -1) { result.swapused = parseFloat(line.split('=')[1].trim()) * 1024 * 1024; }
if (line[i].toLowerCase().indexOf('free') !== -1) { result.swapfree = parseFloat(line[i].split('=')[1].trim()) * 1024 * 1024; } if (line.toLowerCase().indexOf('free') !== -1) { result.swapfree = parseFloat(line.split('=')[1].trim()) * 1024 * 1024; }
} });
} }
} }
if (callback) { callback(result); } if (callback) { callback(result); }

10
lib/osinfo.js
View File

@ -289,8 +289,6 @@ function osInfo(callback) {
result.logofile = getLogoFile(result.distro); result.logofile = getLogoFile(result.distro);
result.codename = 'macOS'; result.codename = 'macOS';
result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename); result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename);
result.codename = (result.release.indexOf('10.4') > -1 ? 'Mac OS X Tiger' : result.codename);
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.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.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.7') > -1 ? 'Mac OS X Lion' : result.codename);
@ -738,9 +736,9 @@ function versions(apps, callback) {
if (_windows) { if (_windows) {
util.powerShell('Get-WmiObject Win32_Service | select caption | fl').then((stdout) => { util.powerShell('Get-WmiObject Win32_Service | select caption | fl').then((stdout) => {
let serviceSections = stdout.split(/\n\s*\n/); let serviceSections = stdout.split(/\n\s*\n/);
for (let i = 0; i < serviceSections.length; i++) { serviceSections.forEach((item) => {
if (serviceSections[i].trim() !== '') { if (item.trim() !== '') {
let lines = serviceSections[i].trim().split('\r\n'); let lines = item.trim().split('\r\n');
let srvCaption = util.getValue(lines, 'caption', ':', true).toLowerCase(); let srvCaption = util.getValue(lines, 'caption', ':', true).toLowerCase();
if (srvCaption.indexOf('postgresql') > -1) { if (srvCaption.indexOf('postgresql') > -1) {
const parts = srvCaption.split(' server '); const parts = srvCaption.split(' server ');
@ -749,7 +747,7 @@ function versions(apps, callback) {
} }
} }
} }
} });
functionProcessed(); functionProcessed();
}); });
} else { } else {