Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Updated systeminformation with changes from master
  • Loading branch information
shoustech committed Oct 5, 2023
commit b3192801ad325c0e1f08ae6857bc2d5f486aac31
9 changes: 5 additions & 4 deletions lib/system.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,10 +318,11 @@ function system(callback) {
exports.system = system;

function cleanDefaults(s) {
if (s === 'Default string') { s = ''; }
if (s.toLowerCase().indexOf('o.e.m.') !== -1) { s = ''; }

return s
const cmpStr = s.toLowerCase();
if (cmpStr.indexOf('o.e.m.') === -1 && cmpStr.indexOf('default string') === -1 && cmpStr !== 'default') {
return s || '';
}
return '';
}
function bios(callback) {

Expand Down
5 changes: 3 additions & 2 deletions lib/wifi.js
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,10 @@ function parseWifiDarwin(wifiObj) {
}
if (wifiItem.SSID && ssid === '') {
try {
console.log('Here')
ssid = Buffer.from(wifiItem.SSID, 'base64').toString('utf8');
} catch { }
} catch (err) {
util.noop();
}
}
result.push({
ssid,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.