osInfo() fix uefi detection (win)

2021-07-27 12:22:45 +02:00
parent cf14cf9dae
commit 5bde87efab
4 changed files with 26 additions and 21 deletions
@@ -365,14 +365,14 @@ function isUefiLinux() {
    process.nextTick(() => {
      fs.stat('/sys/firmware/efi', function (err) {
        if (!err) {
-          resolve(true);
+          return resolve(true);
        } else {
          exec('dmesg | grep -E "EFI v"', function (error, stdout) {
            if (!error) {
              const lines = stdout.toString().split('\n');
-              resolve(lines.length > 0);
+              return resolve(lines.length > 0);
            }
-            resolve(false);
+            return resolve(false);
          });
        }
      });
@@ -387,21 +387,20 @@ function isUefiWindows() {
        exec('findstr /C:"Detected boot environment" "%windir%\\Panther\\setupact.log"', util.execOptsWin, function (error, stdout) {
          if (!error) {
            const line = stdout.toString().split('\n\r')[0];
-            resolve(line.toLowerCase().indexOf('efi') >= 0);
-            return;
+            return resolve(line.toLowerCase().indexOf('efi') >= 0);
          } else {
            exec('echo %firmware_type%', util.execOptsWin, function (error, stdout) {
              if (!error) {
                const line = stdout.toString() || '';
-                resolve(line.toLowerCase().indexOf('efi') >= 0);
+                return resolve(line.toLowerCase().indexOf('efi') >= 0);
              }
-              resolve(false);
+              return resolve(false);
            });
          }
-          resolve(false);
+          return resolve(false);
        });
      } catch (e) {
-        resolve(false);
+        return resolve(false);
      }
    });
  });
@@ -1015,18 +1014,18 @@ function shell(callback) {
    process.nextTick(() => {
      if (_windows) {
        resolve('cmd');
+      } else {
+        let result = '';
+        exec('echo $SHELL', function (error, stdout) {
+          if (!error) {
+            result = stdout.toString().split('\n')[0];
+          }
+          if (callback) {
+            callback(result);
+          }
+          resolve(result);
+        });
      }
-
-      let result = '';
-      exec('echo $SHELL', function (error, stdout) {
-        if (!error) {
-          result = stdout.toString().split('\n')[0];
-        }
-        if (callback) {
-          callback(result);
-        }
-        resolve(result);
-      });
    });
  });
 }