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

Merge pull request #639 from si458/patch-1

Browse Source 
uuid() flip functions around (windows)
This commit is contained in:
Sebastian Hildebrandt 2022-01-17 07:00:59 +01:00 committed by GitHub
commit cd2a52c4d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/osinfo.js
View File

@ -1132,13 +1132,13 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
if (process.arch === 'ia32' && Object.prototype.hasOwnProperty.call(process.env, 'PROCESSOR_ARCHITEW6432')) { if (process.arch === 'ia32' && Object.prototype.hasOwnProperty.call(process.env, 'PROCESSOR_ARCHITEW6432')) {
sysdir = '%windir%\\sysnative\\cmd.exe /c %windir%\\System32'; sysdir = '%windir%\\sysnative\\cmd.exe /c %windir%\\System32';
} }
exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) { util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | fl *').then((stdout) => {
parts = stdout.toString().split('\n\r')[0].split('REG_SZ'); // let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/);
result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : ''; let lines = stdout.split('\r\n');
util.powerShell('Get-WmiObject Win32_ComputerSystemProduct | fl *').then((stdout) => { result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase();
// let lines = stdout.split('\r\n').filter(line => line.trim() !== '').filter((line, idx) => idx > 0)[0].trim().split(/\s\s+/); exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {
let lines = stdout.split('\r\n'); parts = stdout.toString().split('\n\r')[0].split('REG_SZ');
result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase(); result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : '';
if (callback) { if (callback) {
callback(result); callback(result);
} }