From b0dce34b83f2e04dc84314bc9d5a0d6502fe353c Mon Sep 17 00:00:00 2001 From: bryan Date: Fri, 13 Jan 2023 18:15:56 -0500 Subject: [PATCH] Use checksums --- openwrtbuilder | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/openwrtbuilder b/openwrtbuilder index 38dc8d7..c5ad4bf 100755 --- a/openwrtbuilder +++ b/openwrtbuilder @@ -371,13 +371,22 @@ getImageBuilder() { fi if hash sha256sum &>/dev/null; then - # echo "Verifying checksums" - # debug "$dl_tool -s "${P_ARR[sha256_url]}" | grep $filename | cut -f1 -d' '" - if ! $dl_tool -o "$BUILDDIR" "$SHA256_URL"; then - debug "Downloaded sha256sums: $checksum" - fi - fi + debug "Verifying checksums" + if [[ -f $SHA256_FILE ]] && askOk "$SHA256_FILE exists. Re-download?"; then + if ! $dl_tool -so "$SHA256_FILE" "$SHA256_URL"; then + debug "Failed to download checksum" + fi + elif ! $dl_tool -so "$SHA256_FILE" "$SHA256_URL"; then + debug "Failed to download checksum" + fi + + checksum=$(grep "${IB_ARCHIVE##*/}" "$SHA256_FILE" | cut -f1 -d' ') + + echo "$checksum ${IB_ARCHIVE##*/}" | sha256sum --check --status + + debug "checksum return code: $?" + fi echo "Extracting Image Builder archive" [[ ! -d "$BUILDDIR" ]] && mkdir -p "$BUILDDIR"