From 5fa0dbb05936e1a4746711b1a36b9140ed1bd853 Mon Sep 17 00:00:00 2001
From: Sebastian Hildebrandt <hildebrandt@plus-innovations.com>
Date: Mon, 25 Jan 2021 11:07:05 +0100
Subject: [PATCH] smaller fixes during final v5 tests

---
 README.md         | 2 +-
 docs/os.html      | 2 +-
 lib/audio.js      | 1 -
 lib/bluetooth.js  | 4 ++--
 lib/filesystem.js | 2 +-
 lib/osinfo.js     | 4 ++--
 lib/processes.js  | 2 +-
 lib/util.js       | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 2329097..cd54d74 100644
--- a/README.md
+++ b/README.md
@@ -330,7 +330,7 @@ I also created a nice little command line tool called [mmon][mmon-github-url] (m
 | | hardware | X | X | X | X |  | hardware specific UUID |
 | | macs | X | X | X | X |  | MAC addresses |
 | si.versions(apps, cb) | {...} | X | X | X | X | X | version information (kernel, ssl, node, ...)<br />apps param is optional for detecting<br />only specific apps/libs<br />(string, comma separated) |
-| si.shell(cb) | : string | X | X | X |  |  | standard shell |
+| si.shell(cb) | : string | X | X | X | X |  | standard shell |
 | si.users(cb) | [{...}] | X | X | X | X | X | array of users online |
 | | [0].user | X | X | X | X | X | user name |
 | | [0].tty | X | X | X | X | X | terminal |
diff --git a/docs/os.html b/docs/os.html
index ba996cd..3255671 100644
--- a/docs/os.html
+++ b/docs/os.html
@@ -246,7 +246,7 @@ si.osInfo().then(data => console.log(data));</code></pre class="example">
                     <td>X</td>
                     <td>X</td>
                     <td>X</td>
-                    <td></td>
+                    <td>X</td>
                     <td></td>
                     <td>standard shell</td>
                   </tr>
diff --git a/lib/audio.js b/lib/audio.js
index c5b3d13..cbc1157 100644
--- a/lib/audio.js
+++ b/lib/audio.js
@@ -113,7 +113,6 @@ function parseWindowsAudio(lines) {
   result.default = null;
   result.in = null;
   result.out = null;
-  result.interfaceType = null;
   result.status = status;
 
   return result;
diff --git a/lib/bluetooth.js b/lib/bluetooth.js
index 3681340..c4cc3a7 100644
--- a/lib/bluetooth.js
+++ b/lib/bluetooth.js
@@ -108,9 +108,9 @@ function bluetoothDevices(callback) {
         }
         // determine "connected" with hcitool con
         try {
-          const hdicon = execSync('hditool con').toString().toLowerCase();
+          const hdicon = execSync('hcitool con').toString().toLowerCase();
           for (let i = 0; i < result.length; i++) {
-            if (result[i].macAddr1 && result[i].macAddr1.length > 10 && hdicon.indexOf(result[i].macAddr1) >= 0) {
+            if (result[i].macDevice && result[i].macDevice.length > 10 && hdicon.indexOf(result[i].macDevice.toLowerCase()) >= 0) {
               result[i].connected = true;
             }
           }
diff --git a/lib/filesystem.js b/lib/filesystem.js
index 5ef6ec3..caa2bba 100755
--- a/lib/filesystem.js
+++ b/lib/filesystem.js
@@ -1028,7 +1028,7 @@ function diskLayout(callback) {
               const status = util.getValue(lines, 'Status', '=').trim().toLowerCase();
               if (size) {
                 result.push({
-                  device: '',
+                  device: util.getValue(lines, 'PNPDeviceId', '='),
                   type: device.indexOf('SSD') > -1 ? 'SSD' : 'HD',  // just a starting point ... better: MSFT_PhysicalDisk - Media Type ... see below
                   name: util.getValue(lines, 'Caption', '='),
                   vendor: util.getValue(lines, 'Manufacturer', '='),
diff --git a/lib/osinfo.js b/lib/osinfo.js
index a35ec8a..1e87421 100644
--- a/lib/osinfo.js
+++ b/lib/osinfo.js
@@ -353,7 +353,7 @@ function isUefiLinux() {
         if (!err) {
           resolve(true);
         } else {
-          exec('dmesg | grep -E "EFI v|UEFI"', function (error, stdout) {
+          exec('dmesg | grep -E "EFI v"', function (error, stdout) {
             if (!error) {
               const lines = stdout.toString().split('\n');
               resolve(lines.length > 0);
@@ -941,7 +941,7 @@ function shell(callback) {
   return new Promise((resolve) => {
     process.nextTick(() => {
       if (_windows) {
-        resolve(null);
+        resolve('cmd');
       }
 
       let result = '';
diff --git a/lib/processes.js b/lib/processes.js
index 345ff25..1defb3e 100644
--- a/lib/processes.js
+++ b/lib/processes.js
@@ -1002,7 +1002,7 @@ function processLoad(proc, callback) {
 
                   let listPos = -1;
                   for (let j = 0; j < result.length; j++) {
-                    if (result[j].pid === resultProcess.pid || result[j].pids.indexOf(resultProcess.pid) >= 0) { listPos === j; }
+                    if (result[j].pid === resultProcess.pid || result[j].pids.indexOf(resultProcess.pid) >= 0) { listPos = j; }
                   }
                   if (listPos >= 0) {
                     result[listPos].cpu += resultProcess.cpuu + resultProcess.cpus;
diff --git a/lib/util.js b/lib/util.js
index b667bff..455e40d 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -616,7 +616,7 @@ function getFilesInPath(source) {
     let files = dirs
       .map(function (dir) { return getFilesRecursively(dir); })
       .reduce(function (a, b) { return a.concat(b); }, []);
-    return files.concat(getFiles(path));
+    return files.concat(getFiles(source));
   }
 
   if (fs.existsSync(source)) {