diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dfd565..d7b6ffe 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.26.1 | 2020-05-13 | code cleanup | | 4.26.0 | 2020-05-12 | `diskLayout()` added full smart data where supported | | 4.25.2 | 2020-05-12 | `getDynamicData()` added wifiNetworks() | | 4.25.1 | 2020-05-07 | `get()` minor bounds test fix, updated docs | diff --git a/docs/history.html b/docs/history.html index d620c1e..ff0599c 100644 --- a/docs/history.html +++ b/docs/history.html @@ -83,6 +83,11 @@ + + 4.26.1 + 2020-05-13 + code cleanup + 4.26.0 2020-05-12 diff --git a/docs/index.html b/docs/index.html index 1473e8b..a25eab5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -168,7 +168,7 @@
systeminformation
-
Current Version: 4.26.0
+
Current Version: 4.26.1
diff --git a/lib/filesystem.js b/lib/filesystem.js index be670ee..cc472b9 100755 --- a/lib/filesystem.js +++ b/lib/filesystem.js @@ -801,7 +801,7 @@ function diskLayout(callback) { BSDName: BSDName }); cmd += `printf "\n${BSDName}|"; smartctl -H ${BSDName} | grep overall;`; - cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};` + cmdFullSmart += `${cmdFullSmart ? 'printf ",";' : ''}smartctl -a -j ${BSDName};`; }); } catch (e) { util.noop(); @@ -809,20 +809,20 @@ function diskLayout(callback) { } // check S.M.A.R.T. status if (cmdFullSmart) { - exec(cmdFullSmart, function (error, stdout) { - try { - const data = JSON.parse(`[${stdout}]`); - data.forEach(disk => { - const diskBSDName = disk.smartctl.argv[disk.smartctl.argv.length - 1]; + exec(cmdFullSmart, function (error, stdout) { + try { + const data = JSON.parse(`[${stdout}]`); + data.forEach(disk => { + const diskBSDName = disk.smartctl.argv[disk.smartctl.argv.length - 1]; - for (let i = 0; i < result.length; i++) { - if (result[i].BSDName === diskBSDName) { - result[i].smartStatus = (disk.smart_status.passed ? 'Ok' : (disk.smart_status.passed === false ? 'Predicted Failure' : 'unknown')); - result[i].smartData = disk; - } + for (let i = 0; i < result.length; i++) { + if (result[i].BSDName === diskBSDName) { + result[i].smartStatus = (disk.smart_status.passed ? 'Ok' : (disk.smart_status.passed === false ? 'Predicted Failure' : 'unknown')); + result[i].smartData = disk; } - }); - commitResult(result); + } + }); + commitResult(result); } catch (e) { if (cmd) { cmd = cmd + 'printf "\n"';