Merge branch 'master' of https://github.com/inhere/kite

inhere · Jul 11, 2022 · 14f0eb1 · 14f0eb1
2 parents 30b01de + 0ebbb23
commit 14f0eb1
Show file tree

Hide file tree

Showing 4 changed files with 147 additions and 141 deletions.
diff --git a/app/Console/Command/EnvCommand.php b/app/Console/Command/EnvCommand.php
@@ -14,6 +14,7 @@
 use Inhere\Console\IO\Output;
 use Toolkit\Stdlib\OS;
 use function is_scalar;
+use function ucfirst;
 
 /**
  * Class DemoCommand
@@ -53,8 +54,12 @@ protected function execute(Input $input, Output $output)
         if ($name) {
             $value = null;
             $upKey = strtoupper($name);
+            // fix: in windows, ENV 'PATH' is 'Path'
+            $upFKey = ucfirst($name);
             if (isset($_SERVER[$upKey])) {
                 $value = $_SERVER[$upKey];
+            } elseif (isset($_SERVER[$upFKey])) {
+                $value = $_SERVER[$upFKey];
             } elseif (isset($_SERVER[$name])) {
                 $value = $_SERVER[$name];
             }

diff --git a/app/Console/simple-cmds.php b/app/Console/simple-cmds.php
@@ -12,17 +12,17 @@
     $name = $fs->getArg('binName');
     $path = Sys::findExecutable($name);
     if (!$path) {
-        $output->println('Not found');
+        $output->println('Not found in PATH');
         return;
     }
 
-    $clean = $fs->getOpt('clean');
-    $output->colored($clean ? $path : "Path: $path");
+    // $clean = $fs->getOpt('clean');
+    $output->colored($path);
 }, [
     'desc'      => 'find bin file path, like system `which`',
     'aliases'   => ['where', 'whereis'],
     'options'   => [
-        '--clean' => 'bool;clean output, only output path.'
+        // '--clean' => 'bool;clean output, only output path.'
     ],
     'arguments' => [
         'binName' => 'string;the target bin file name for find;true',