diff --git a/CHANGELOG.md b/CHANGELOG.md index 35a68105..cb355248 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -83,6 +83,7 @@ For major (breaking) changes - **version 4, 3 and 2** - see end of page. | Version | Date | Comment | | ------- | ---------- | --------------------------------------------------------------------------------------------------- | +| 5.22.4 | 2024-03-16 | `uuid()` improved parsing machine id (linux) | | 5.22.3 | 2024-03-15 | `chassis()` improved parsing memory bank (windows) | | 5.22.2 | 2024-03-14 | `chassis()` type, assetTag, sku improved parsing (macOS) | | 5.22.1 | 2024-03-12 | `wifiConnections()` patch for mac OS Sonome 14.4 (macOS) | diff --git a/docs/history.html b/docs/history.html index 1764cfc7..1f8e7e3a 100644 --- a/docs/history.html +++ b/docs/history.html @@ -57,6 +57,11 @@

Full version history

+ + 5.22.4 + 2024-03-16 + uuid() improved parsing machine id (linux) + 5.22.3 2024-03-15 diff --git a/docs/index.html b/docs/index.html index e2210e4d..edd41e2a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -170,7 +170,7 @@
systeminformation
 
-
New Version: 5.22.3
+
New Version: 5.22.4
diff --git a/docs/system.html b/docs/system.html index a452a4d5..a3f6c0a7 100644 --- a/docs/system.html +++ b/docs/system.html @@ -522,7 +522,7 @@
Example
sku - + x X SKU number @@ -537,11 +537,11 @@
Example
{ manufacturer: 'Apple Inc.', model: 'MacBookPro13,2', - type: '', + type: 'Laptop', version: '1.0', serial: 'C01xxxxxxxx', assetTag: 'Mac-99878xxxx...', - sku: '' + sku: 'A1706' } diff --git a/lib/osinfo.js b/lib/osinfo.js index fd9f88c2..58f740e1 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -1122,8 +1122,8 @@ function uuid(callback) { }); } if (_linux) { - const cmd = `echo -n "os: "; cat /var/lib/dbus/machine-id 2> /dev/null; echo; -echo -n "os: "; cat /etc/machine-id 2> /dev/null; echo; + const cmd = `echo -n "os: "; cat /var/lib/dbus/machine-id 2> /dev/null || +cat /etc/machine-id 2> /dev/null; echo; echo -n "hardware: "; cat /sys/class/dmi/id/product_uuid 2> /dev/null; echo;`; exec(cmd, function (error, stdout) { const lines = stdout.toString().split('\n');