tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-04-08 17:15:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename application/VERSION to application/GITCOMMIT

Browse Source 
refs #9247
This commit is contained in:
Alexander A. Klimov 2015-06-05 12:38:55 +02:00
parent 3e99adbe63
commit feb27b8a02
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -8,4 +8,4 @@ Vagrantfile export-ignore
.puppet* eol=lf
# Include version information on `git archive'
/application/VERSION export-subst
/application/GITCOMMIT export-subst

0
application/VERSION → application/GITCOMMIT
View File

2
icingaweb2.spec
View File

@ -204,7 +204,7 @@ rm -rf %{buildroot}
%{basedir}/application/forms
%{basedir}/application/layouts
%{basedir}/application/views
%{basedir}/application/VERSION
%{basedir}/application/GITCOMMIT
%{basedir}/doc
%{basedir}/modules
%{basedir}/public

2
library/Icinga/Application/Version.php
View File

@ -17,7 +17,7 @@ class Version
*/
public static function get()
{
if (false !== ($appVersion = @file_get_contents(Icinga::app()->getApplicationDir('VERSION')))) {
if (false !== ($appVersion = @file_get_contents(Icinga::app()->getApplicationDir('GITCOMMIT')))) {
$matches = array();
if (@preg_match('/^(?P<gitCommitID>\w+) (?P<gitCommitDate>\S+)/', $appVersion, $matches)) {
$matches['appVersion'] = self::VERSION;