Explorar o código

[FIX] Installation without git - wrong logs + showing branch "unknown" (#693)

Dennis %!s(int64=2) %!d(string=hai) anos
pai
achega
985a4e94cb

+ 1 - 1
app/Providers/AppServiceProvider.php

@@ -135,7 +135,7 @@ class AppServiceProvider extends ServiceProvider
                 $branchname = $explodedstring[2]; //get the one that is always the branch name
             } catch (Exception $e) {
                 $branchname = 'unknown';
-                Log::error($e);
+                Log::notice($e);
             }
             config(['BRANCHNAME' => $branchname]);
 

+ 1 - 1
themes/default/views/layouts/main.blade.php

@@ -442,7 +442,7 @@
                     href="{{ url('/') }}">{{ env('APP_NAME', 'Laravel') }}</a>.</strong>
             All rights
             reserved. Powered by <a href="https://controlpanel.gg">ControlPanel</a>.
-            @if (!str_contains(config('BRANCHNAME'), 'main'))
+            @if (!str_contains(config('BRANCHNAME'), 'main') && !str_contains(config('BRANCHNAME'), 'unknown'))
                 Version <b>{{ config('app')['version'] }} - {{ config('BRANCHNAME') }}</b>
             @endif