浏览代码

Update AppServiceProvider.php

1day2die 2 年之前
父节点
当前提交
44db7b4847
共有 1 个文件被更改,包括 15 次插入13 次删除
  1. 15 13
      app/Providers/AppServiceProvider.php

+ 15 - 13
app/Providers/AppServiceProvider.php

@@ -60,6 +60,21 @@ class AppServiceProvider extends ServiceProvider
             URL::forceScheme('https');
         }
 
+        //get the Github Branch the panel is running on
+        try {
+            $stringfromfile = file(base_path() . '/.git/HEAD');
+
+            $firstLine = $stringfromfile[0]; //get the string from the array
+
+            $explodedstring = explode('/', $firstLine, 3); //seperate out by the "/" in the string
+
+            $branchname = $explodedstring[2]; //get the one that is always the branch name
+        } catch (Exception $e) {
+            $branchname = 'unknown';
+            Log::notice($e);
+        }
+        config(['BRANCHNAME' => $branchname]);
+
         // Do not run this code if no APP_KEY is set
         if (config('app.key') == null) return;
 
@@ -76,18 +91,5 @@ class AppServiceProvider extends ServiceProvider
         $settings = $this->app->make(MailSettings::class);
         $settings->setConfig();
 
-        try {
-            $stringfromfile = file(base_path() . '/.git/HEAD');
-
-            $firstLine = $stringfromfile[0]; //get the string from the array
-
-            $explodedstring = explode('/', $firstLine, 3); //seperate out by the "/" in the string
-
-            $branchname = $explodedstring[2]; //get the one that is always the branch name
-        } catch (Exception $e) {
-            $branchname = 'unknown';
-            Log::notice($e);
-        }
-        config(['BRANCHNAME' => $branchname]);
     }
 }