From 398f90f7f436c6773f003692857e62aabf8a6d6d Mon Sep 17 00:00:00 2001 From: DL6ER Date: Thu, 28 Mar 2024 09:12:51 +0100 Subject: [PATCH] Non-matching checksums are not always corruption. Actually, they will instead be caused by binaries updated on the remote branch. This is most seen with frequently channging branchs such as development-v6 at this time. Signed-off-by: DL6ER --- automated install/basic-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index d057cb82..41cc2161 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -2030,7 +2030,7 @@ FTLcheckUpdate() { # Alt branches don't have a tagged version against them, so just # confirm the checksum of the local vs remote to decide whether we # download or not - printf " %b FTL binary already installed. Confirming Checksum...\\n" "${INFO}" + printf " %b FTL binary already installed, verifying integrity...\\n" "${INFO}" checkSumFile="https://ftl.pi-hole.net/${ftlBranch}/${binary}.sha1" # Continue further down... else @@ -2061,7 +2061,7 @@ FTLcheckUpdate() { # If the installed version matches the latest version, then # check the installed sha1sum of the binary vs the remote # sha1sum. If they do not match, then download - printf " %b Latest FTL binary already installed (%s). Confirming Checksum...\\n" "${INFO}" "${FTLlatesttag}" + printf " %b Latest FTL binary already installed (%s), verifying integrity...\\n" "${INFO}" "${FTLlatesttag}" checkSumFile="https://github.com/pi-hole/FTL/releases/download/${FTLversion%$'\r'}/${binary}.sha1" # Continue further down... fi @@ -2078,14 +2078,14 @@ FTLcheckUpdate() { # Check we downloaded a valid checksum (no 404 or other error like # no DNS resolution) if [[ ! "${remoteSha1}" =~ ^[a-f0-9]{40}$ ]]; then - printf " %b Remote checksum not available, trying to redownload binary...\\n" "${CROSS}" + printf " %b Remote checksum not available, trying to redownload...\\n" "${CROSS}" return 0 elif [[ "${remoteSha1}" != "${localSha1}" ]]; then - printf " %b Corruption detected, redownloading binary...\\n" "${CROSS}" + printf " %b Remote binary is different, downloading...\\n" "${CROSS}" return 0 fi - printf " %b Checksum correct. No need to download!\\n" "${INFO}" + printf " %b Local binary up-to-date. No need to download!\\n" "${INFO}" return 1 }