some update

Author: inhere

src/Utils/CliUtil.php

@@ -14,6 +14,18 @@
  */
 final class CliUtil
 {
+    /**
+     * get bash is available
+     * @return bool
+     */
+    public static function bashIsAvailable()
+    {
+        // $checkCmd = "/usr/bin/env bash -c 'echo OK'";
+        // $shell = 'echo $0';
+        $checkCmd = "bash -c 'echo OK'";
+
+        return self::runCommand($checkCmd, false) === 'OK';
+    }
 
     /**
      * @return string

src/Utils/Helper.php

@@ -393,21 +393,14 @@ public static function getScreenSize($refresh = false)
             return $size;
         }
 
-        if (self::isOnWindows()) {
-            $output = [];
-            exec('mode con', $output);
-
-            if (isset($output[1]) && strpos($output[1], 'CON') !== false) {
-                return ($size = [
-                    (int)preg_replace('~\D~', '', $output[3]),
-                    (int)preg_replace('~\D~', '', $output[4])
-                ]);
-            }
-        } else {
+        if (CliUtil::bashIsAvailable()) {
             // try stty if available
             $stty = [];
-            if (exec('stty -a 2>&1', $stty) && preg_match('/rows\s+(\d+);\s*columns\s+(\d+);/mi', implode(' ', $stty),
-                    $matches)) {
+
+            if (
+                exec('stty -a 2>&1', $stty) &&
+                preg_match('/rows\s+(\d+);\s*columns\s+(\d+);/mi', implode(' ', $stty), $matches)
+            ) {
                 return ($size = [$matches[2], $matches[1]]);
             }
 
@@ -422,6 +415,18 @@ public static function getScreenSize($refresh = false)
             }
         }
 
+        if (self::isOnWindows()) {
+            $output = [];
+            exec('mode con', $output);
+
+            if (isset($output[1]) && strpos($output[1], 'CON') !== false) {
+                return ($size = [
+                    (int)preg_replace('~\D~', '', $output[3]),
+                    (int)preg_replace('~\D~', '', $output[4])
+                ]);
+            }
+        }
+
         return ($size = false);
     }
 

src/Utils/Interact.php

@@ -428,10 +428,9 @@ public static function promptSilent(string $prompt = 'Enter Password:')
 
         // $checkCmd = "/usr/bin/env bash -c 'echo OK'";
         // $shell = 'echo $0';
-        $checkCmd = "bash -c 'echo OK'";
 
         // linux, unix, git-bash
-        if (CliUtil::runCommand($checkCmd, false) === 'OK') {
+        if (CliUtil::bashIsAvailable()) {
             // COMMAND: bash -c 'read -p "Enter Password:" -s user_input && echo $user_input'
             $command = sprintf('bash -c "read -p \'%s\' -s user_input && echo $user_input"', $prompt);
             $password = CliUtil::runCommand($command, false);