Browse Source

More work on sha256sum

bryan 2 years ago
parent
commit
b1f664ca7c
1 changed files with 5 additions and 9 deletions
  1. 5 9
      openwrtbuilder

+ 5 - 9
openwrtbuilder

@@ -375,7 +375,7 @@ getImageBuilder() {
 verifyImage() {
 verifyImage() {
     debug "${FUNCNAME[0]}"
     debug "${FUNCNAME[0]}"
 
 
-    declare checksum file_to_check
+    declare checksum
 
 
     if hash sha256sum &>/dev/null; then
     if hash sha256sum &>/dev/null; then
         debug "Verifying Image Builder checksums"
         debug "Verifying Image Builder checksums"
@@ -388,14 +388,10 @@ verifyImage() {
             debug "Failed to download checksum"
             debug "Failed to download checksum"
         fi
         fi
 
 
-        for file_to_check in "$FACTORYIMGGZ" "$SYSUPGRADEIMGGZ"; do
-            debug "file_to_check: $file_to_check"
-            [[ -f $file_to_check ]] || continue
-            checksum=$(grep "${file_to_check##*/}" "$SHA256_FILE" | cut -f1 -d' ')
-            debug "checksum: $checksum"
-            echo -n "$checksum $file_to_check" | sha256sum --check --status
-            debug "checksum return code: $?"
-        done
+        checksum=$(grep "${IB_ARCHIVE##*/}" "$SHA256_FILE" | cut -f1 -d' ')
+        debug "checksum: $checksum"
+        echo -n "$checksum $IB_ARCHIVE" | sha256sum --check --status
+        debug "checksum return code: $?"
     fi
     fi
 }
 }