Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix update logic for custom branches by comparing hashes (#2737)

Browse Source
This commit is contained in:
yubiuser
2023-10-12 20:22:26 +02:00
committed by GitHub
parent 340d373711 45b1c66798
commit 2fbef7f40e
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
scripts/pi-hole/js/footer.js
View File

@@ -475,6 +475,7 @@ function updateVersionInfo() {
remote: version.core.remote.version,
branch: version.core.local.branch,
hash: version.core.local.hash,
hash_remote: version.core.remote.hash,
url: "https://github.com/pi-hole/pi-hole/releases",
},
{
@@ -483,6 +484,7 @@ function updateVersionInfo() {
remote: version.ftl.remote.version,
branch: version.ftl.local.branch,
hash: version.ftl.local.hash,
hash_remote: version.ftl.remote.hash,
url: "https://github.com/pi-hole/FTL/releases",
},
{
@@ -491,6 +493,7 @@ function updateVersionInfo() {
remote: version.web.remote.version,
branch: version.web.local.branch,
hash: version.web.local.hash,
hash_remote: version.web.remote.hash,
url: "https://github.com/pi-hole/web/releases",
},
];
@@ -509,11 +512,25 @@ function updateVersionInfo() {
'" rel="noopener" target="_blank">' +
localVersion +
"</a>";
} else localVersion = "vDev (" + v.branch + ", " + v.hash + ")";
if (versionCompare(v.local, v.remote) === -1) {
// Update available
updateAvailable = true;
}
} else {
// non-master branch
localVersion = "vDev (" + v.branch + ", " + v.hash + ")";
if (v.hash !== v.hash_remote) {
// hash differ > Update available
updateAvailable = true;
}
}
if (versionCompare(v.local, v.remote) === -1) {
if (v.name === "Docker Tag") dockerUpdate = true;
else updateAvailable = true;
if (v.name === "Docker Tag" && versionCompare(v.local, v.remote) === -1) {
updateAvailable = true;
dockerUpdate = true;
}
if (updateAvailable) {
$("#versions").append(
"<li><strong>" +
v.name +