diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 38f04ce..5bde11e 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -40,7 +40,12 @@ class AppServiceProvider extends ServiceProvider } catch (\Throwable) {} }); - config(['app.version' => trim(@file_get_contents('/var/lib/mailwolt/version')) ?: 'dev']); + $fileVer = trim(@file_get_contents('/var/lib/mailwolt/version') ?: ''); + $gitVer = trim(@shell_exec('git -C ' . escapeshellarg(base_path()) . ' describe --tags --abbrev=0 2>/dev/null') ?: ''); + $gitVer = ltrim($gitVer, 'vV'); + // git-Tag bevorzugen wenn er neuer als die Version-Datei ist + $appVer = ($gitVer && (!$fileVer || version_compare($gitVer, $fileVer, '>'))) ? $gitVer : ($fileVer ?: 'dev'); + config(['app.version' => $appVer]); if (file_exists(base_path('.git/HEAD'))) { $ref = trim(file_get_contents(base_path('.git/HEAD'))); if (str_starts_with($ref, 'ref:')) {