Skip to content

Commit

Permalink
Rename application/VERSION to application/GITCOMMIT
Browse files Browse the repository at this point in the history
refs #9247
  • Loading branch information
Al2Klimov committed Sep 24, 2015
1 parent 3e99adb commit feb27b8
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ Vagrantfile export-ignore
.puppet* eol=lf

# Include version information on `git archive'
/application/VERSION export-subst
/application/GITCOMMIT export-subst
File renamed without changes.
2 changes: 1 addition & 1 deletion icingaweb2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion library/Icinga/Application/Version.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit feb27b8

Please sign in to comment.