up: allow limit load os env for action

inhere · Apr 22, 2021 · e4774d1 · e4774d1
1 parent 41206a6
commit e4774d1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/app/Console/Controller/GitHubController.php b/app/Console/Controller/GitHubController.php
@@ -45,7 +45,7 @@ protected static function commandAliases(): array
 
     protected function beforeExecute(): bool
     {
-        AppHelper::loadOsEnvInfo($this->app);
+        // AppHelper::loadOsEnvInfo($this->app);
 
         return true;
     }

diff --git a/app/Console/Controller/GitUseController.php b/app/Console/Controller/GitUseController.php
@@ -19,6 +19,7 @@
 use PhpGit\Repo;
 use function array_keys;
 use function implode;
+use function in_array;
 use function sprintf;
 use function strlen;
 use function strpos;
@@ -79,7 +80,15 @@ protected static function commandAliases(): array
      */
     protected function beforeExecute(): bool
     {
-        AppHelper::loadOsEnvInfo($this->app);
+        // \ddump($this);
+        if ($this->app) {
+            $groupSettings = $this->app->getParam('git', []);
+            $proxyActions = $groupSettings['loadEnvOn'] ?? [];
+
+            if ($proxyActions && in_array($this->getAction(), $proxyActions, true)) {
+                AppHelper::loadOsEnvInfo($this->app);
+            }
+        }
 
         return true;
     }

diff --git a/app/Helper/AppHelper.php b/app/Helper/AppHelper.php
@@ -2,8 +2,8 @@
 
 namespace Inhere\Kite\Helper;
 
-use Inhere\Console\Util\Show;
 use Inhere\Console\Application;
+use Inhere\Console\Util\Show;
 use Toolkit\Sys\Sys;
 use function explode;
 use function getenv;
@@ -71,7 +71,7 @@ public static function getLangFromENV(string $default = ''): string
 
         // zh_CN.UTF-8
         if (strpos($value, '.') > 0) {
-            [$value, ] = explode('.', $value);
+            [$value,] = explode('.', $value);
 
             return self::LANG_MAP[$value] ?? $value;
         }
@@ -120,7 +120,10 @@ public static function loadOsEnvInfo(Application $app): void
             return;
         }
 
-        Show::aList($osEnv, 'Put ENV From Config: "osEnv"', ['ucFirst' => false]);
+        Show::aList($osEnv, 'Put ENV From Config: "osEnv"', [
+            'ucFirst'      => false,
+            'ucTitleWords' => false,
+        ]);
         // Sys::setOSEnv() TODO
         foreach ($osEnv as $name => $value) {
             putenv("$name=$value");