diff --git a/bootstrap.php b/bootstrap.php index fe3dd2155b8fdd0e2dbb21d249d5eeba247fadc0..5de6b70f33916587e978f9f427880e5707e9fae4 100644 --- a/bootstrap.php +++ b/bootstrap.php @@ -314,9 +314,9 @@ define('CLI_DIR', INCLUDE_DIR.'cli/'); /*############## Do NOT monkey with anything else beyond this point UNLESS you really know what you are doing ##############*/ #Current version && schema signature (Changes from version to version) -define('THIS_VERSION','1.8-git'); //Shown on admin panel define('GIT_VERSION','$git'); define('MAJOR_VERSION', '1.10'); +define('THIS_VERSION', MAJOR_VERSION.'-git'); //Shown on admin panel //Path separator if(!defined('PATH_SEPARATOR')){ if(strpos($_ENV['OS'],'Win')!==false || !strcasecmp(substr(PHP_OS, 0, 3),'WIN')) diff --git a/include/cli/modules/deploy.php b/include/cli/modules/deploy.php index eb76a165f0f9784d8b9ad1c7debf4edb735861d3..f9eb912af33b15591d53f0a9d62e8b6bb5e4fb00 100644 --- a/include/cli/modules/deploy.php +++ b/include/cli/modules/deploy.php @@ -122,7 +122,7 @@ class Deployment extends Unpacker { } if (!$version) - $version = exec('git describe'); + $version = preg_replace('/^v(\d{1}\.\d{2}).*$/', '$1-git', exec('git describe')); if (!$short || !$version) return false;