Fixes to version tag in siteinfo/json

This commit is contained in:
Paolo Tacconi 2015-02-20 10:29:33 +01:00
parent 5aad4a19f8
commit 2765500844

View File

@ -51,10 +51,10 @@ function siteinfo_init(&$a) {
$site_info = get_config('system','info'); $site_info = get_config('system','info');
$site_name = get_config('system','sitename'); $site_name = get_config('system','sitename');
if(! get_config('system','hidden_version_siteinfo')) { if(! get_config('system','hidden_version_siteinfo')) {
$version = sprintf( t('Version %s'), RED_VERSION ); $version = RED_VERSION;
if(@is_dir('.git') && function_exists('shell_exec')) { if(@is_dir('.git') && function_exists('shell_exec')) {
$commit = @shell_exec('git log -1 --format="%h"'); $commit = trim( @shell_exec('git log -1 --format="%h"'));
$tag = @shell_exec('git describe --tags --abbrev=0'); $tag = trim( @shell_exec('git describe --tags --abbrev=0'));
} }
if(! isset($commit) || strlen($commit) > 16) if(! isset($commit) || strlen($commit) > 16)
$commit = ''; $commit = '';