Added a shortened commit hash along the version

The commit value is replaced when building the zip file
This commit is contained in:
Wruczek 2018-12-30 04:27:43 +01:00
parent e1e95639ad
commit d8fec04d81
4 changed files with 9 additions and 2 deletions

View File

@ -117,7 +117,12 @@
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h4 class="card-title text-center">Welcome to TS-website <?= __TSWEBSITE_VERSION ?> Installer!</h4> <h4 class="card-title text-center mb-0">Welcome to TS-website Installer!</h4>
<p class="card-text text-center text-muted font-italic mb-5">
Version <?= __TSWEBSITE_VERSION ?> (<?= __TSWEBSITE_COMMIT ?>)
</p>
<p class="card-text">This wizard will guide you through the installation process of TS-website.</p> <p class="card-text">This wizard will guide you through the installation process of TS-website.</p>
<p class="card-text text-danger" id="hidejs">Please enable Javascript before continuing!</p> <p class="card-text text-danger" id="hidejs">Please enable Javascript before continuing!</p>
<p class="card-text"> <p class="card-text">

View File

@ -13,6 +13,7 @@ if(!empty($_COOKIE["tsw_allow_metrics"])) {
$data = [ $data = [
"tswVersion" => __TSWEBSITE_VERSION, "tswVersion" => __TSWEBSITE_VERSION,
"tswCommit" => __TSWEBSITE_COMMIT,
"phpVersion" => PHP_VERSION, "phpVersion" => PHP_VERSION,
"os" => sprintf("%s %s %s %s", php_uname("s"), php_uname("r"), php_uname("v"), php_uname("m")), // no hostname "os" => sprintf("%s %s %s %s", php_uname("s"), php_uname("r"), php_uname("v"), php_uname("m")), // no hostname
"webServer" => $_SERVER["SERVER_SOFTWARE"], "webServer" => $_SERVER["SERVER_SOFTWARE"],

View File

@ -1,5 +1,6 @@
<?php <?php
define("__TSWEBSITE_VERSION", "dev-2.0.0"); define("__TSWEBSITE_VERSION", "dev-2.0.0");
define("__TSWEBSITE_COMMIT", "no-commit");
define("__BASE_DIR", __DIR__ . "/../.."); define("__BASE_DIR", __DIR__ . "/../..");
define("__PRIVATE_DIR", __BASE_DIR . "/private"); define("__PRIVATE_DIR", __BASE_DIR . "/private");
define("__CACHE_DIR", __PRIVATE_DIR . "/cache"); define("__CACHE_DIR", __PRIVATE_DIR . "/cache");

View File

@ -210,7 +210,7 @@ $navActiveIndex = isset($navActiveIndex) ? (int) $navActiveIndex : 0;
{block footerbottom}{/block} {block footerbottom}{/block}
<!-- <!--
TS-website {\__TSWEBSITE_VERSION} by Wruczek TS-website {\__TSWEBSITE_VERSION} ({\__TSWEBSITE_COMMIT}) by Wruczek
Generated in {@$tplutils::getRenderTime()} s Generated in {@$tplutils::getRenderTime()} s
MySQL queries: {$sqlCount} MySQL queries: {$sqlCount}
--> -->