Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-27 05:56:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding branch/version display for FTL

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER
2017-12-04 21:50:14 +01:00
parent c2d9506bec
commit 6e6151c9cd
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/pi-hole/php/update_checker.php
View File

@@ -42,8 +42,15 @@ else
$web_current = explode("-",$versions[1])[0];
}
/********** Get Pi-hole FTL version (not a git repository) **********/
$FTL_current = $versions[2];
/********** Get Pi-hole FTL (not a git repository) **********/
$FTL_branch = $branches[2];
if($FTL_branch !== "master") {
$FTL_current = "vDev";
$FTL_commit = $versions[2];
}
else {
$FTL_current = explode("-",$versions[2])[0];
}
// Get data from GitHub
$core_latest = $GitHubversions[0];
@@ -77,7 +84,15 @@ else
// FTL version comparison
// This logic allows the local core version to be newer than the upstream version
// The update indicator is only shown if the upstream version is NEWER
$FTL_update = (version_compare($FTL_current, $FTL_latest) < 0);
if($FTL_current !== "vDev")
{
$FTL_update = (version_compare($FTL_current, $FTL_latest) < 0);
}
else
{
$FTL_update = false;
}
}
?>