kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixed version display in prerelease mode

Browse Source
This commit is contained in:
Bernd Bestel
2019-09-18 17:27:47 +02:00
parent 2237e2f8f4
commit ca470ed4ee
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/ApplicationService.php
View File

@@ -9,19 +9,15 @@ class ApplicationService extends BaseService
{ {
if ($this->InstalledVersion == null) if ($this->InstalledVersion == null)
{ {
$this->InstalledVersion = json_decode(file_get_contents(__DIR__ . '/../version.json'));
if (GROCY_MODE === 'prerelease') if (GROCY_MODE === 'prerelease')
{ {
$commitHash = trim(exec('git log --pretty="%h" -n1 HEAD')); $commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
$commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD')); $commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD'));
$this->InstalledVersion = array( $this->InstalledVersion->Version = "pre-release-$commitHash";
'Version' => "pre-release-$commitHash", $this->InstalledVersion->ReleaseDate = substr($commitDate, 0, 19);
'ReleaseDate' => substr($commitDate, 0, 19)
);
}
else
{
$this->InstalledVersion = json_decode(file_get_contents(__DIR__ . '/../version.json'));
} }
} }