From fe63c18d9b9efd4c065edbcc55c8b42441d1fe28 Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Fri, 24 Jan 2020 22:55:55 +0100 Subject: [PATCH] memLayout() bank info fix macOS --- CHANGELOG.md | 1 + docs/history.html | 5 +++++ docs/index.html | 2 +- lib/memory.js | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c526e8..c2bf333 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page. | Version | Date | Comment | | -------------- | -------------- | -------- | +| 4.19.3 | 2020-01-24 | `memLayout()` bank info fix macOS | | 4.19.2 | 2020-01-19 | `cpu()` muli-processor fix windows | | 4.19.1 | 2020-01-14 | `osInfo()` uefi fix windows | | 4.19.0 | 2020-01-12 | `osInfo()` added uefi | diff --git a/docs/history.html b/docs/history.html index 5b3c5f5..27ec030 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,6 +83,11 @@ + + 4.19.3 + 2020-01-24 + memLayout() bank info fix macOS + 4.19.2 2020-01-19 diff --git a/docs/index.html b/docs/index.html index 1b34972..591024f 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.19.2
+
Current Version: 4.19.3
diff --git a/lib/memory.js b/lib/memory.js index 0edf316..fe99a5a 100644 --- a/lib/memory.js +++ b/lib/memory.js @@ -38,7 +38,8 @@ const OSX_RAM_manufacturers = { '0x02FE': 'Elpida', '0x5105': 'Qimonda AG i. In.', '0x8551': 'Qimonda AG i. In.', - '0x859B': 'Crucial' + '0x859B': 'Crucial', + '0x04CD': 'G-Skill' }; // _______________________________________________________________________________________ @@ -330,7 +331,7 @@ function memLayout(callback) { devices.shift(); devices.forEach(function (device) { let lines = device.split('\n'); - const bank = (hasBank ? 'BANK ' : 'DIMM') + lines[0].trim(); + const bank = (hasBank ? 'BANK ' : 'DIMM') + lines[0].trim().split('/')[0]; const size = parseInt(util.getValue(lines, ' Size')); if (size) { result.push({