Skip to content

Fixed the problem of not being able to obtain hardware information after replacing the memory stick #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
KavenLong wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Open

Fixed the problem of not being able to obtain hardware information after replacing the memory stick #989

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion lib/osinfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,18 @@ echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`;
}
util.powerShell('Get-CimInstance Win32_ComputerSystemProduct | select UUID | fl').then((stdout) => {
let lines = stdout.split('\r\n');
result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase();
let output = ''
const windir = process.env.windir || 'C:\\Windows';
const wmicPath = `${windir}\\System32\\wbem\\wmic.exe`;
if (fs.existsSync(wmicPath)) {
output = execSync(
`"${wmicPath}" csproduct get uuid`,
{ encoding: 'utf-8' }
).split('\n')[1]
.trim()
.toLowerCase();
}
result.hardware = util.getValue(lines, 'uuid', ':').toLowerCase() || output;
exec(`${sysdir}\\reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Cryptography" /v MachineGuid`, util.execOptsWin, function (error, stdout) {
parts = stdout.toString().split('\n\r')[0].split('REG_SZ');
result.os = parts.length > 1 ? parts[1].replace(/\r+|\n+|\s+/ig, '').toLowerCase() : '';
Expand Down