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

osInfo() improved release parsing (linux)

Browse Source
This commit is contained in:
Sebastian Hildebrandt 2024-01-21 11:45:58 +01:00
parent 9ffc74a0b2
commit 38ec864603
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/osinfo.js
View File

@ -243,14 +243,18 @@ function osInfo(callback) {
release[line.split('=')[0].trim().toUpperCase()] = line.split('=')[1].trim(); release[line.split('=')[0].trim().toUpperCase()] = line.split('=')[1].trim();
} }
}); });
result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
result.logofile = getLogoFile(result.distro);
let releaseVersion = (release.VERSION || '').replace(/"/g, ''); let releaseVersion = (release.VERSION || '').replace(/"/g, '');
let codename = (release.DISTRIB_CODENAME || release.VERSION_CODENAME || '').replace(/"/g, ''); let codename = (release.DISTRIB_CODENAME || release.VERSION_CODENAME || '').replace(/"/g, '');
const prettyName = (release.PRETTY_NAME || '').replace(/"/g, '');
if (prettyName.indexOf(result.distro + ' ') === 0) {
releaseVersion = prettyName.replace(result.distro + ' ', '').trim();
}
if (releaseVersion.indexOf('(') >= 0) { if (releaseVersion.indexOf('(') >= 0) {
codename = releaseVersion.split('(')[1].replace(/[()]/g, '').trim(); codename = releaseVersion.split('(')[1].replace(/[()]/g, '').trim();
releaseVersion = releaseVersion.split('(')[0].trim(); releaseVersion = releaseVersion.split('(')[0].trim();
} }
result.distro = (release.DISTRIB_ID || release.NAME || 'unknown').replace(/"/g, '');
result.logofile = getLogoFile(result.distro);
result.release = (releaseVersion || release.DISTRIB_RELEASE || release.VERSION_ID || 'unknown').replace(/"/g, ''); result.release = (releaseVersion || release.DISTRIB_RELEASE || release.VERSION_ID || 'unknown').replace(/"/g, '');
result.codename = codename; result.codename = codename;
result.codepage = util.getCodepage(); result.codepage = util.getCodepage();