bryan/openwrtbuilder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor verifyImage

Browse Source
This commit is contained in:
Bryan Roessler
2023-01-13 21:55:45 -05:00
parent 8eb569ecdd
commit a9696ac713
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openwrtbuilder
View File

@@ -375,7 +375,7 @@ getImageBuilder() {
verifyImage() { verifyImage() {
debug "${FUNCNAME[0]}" debug "${FUNCNAME[0]}"
declare checksum declare checksum file
if hash sha256sum &>/dev/null; then if hash sha256sum &>/dev/null; then
debug "Verifying Image Builder checksums" debug "Verifying Image Builder checksums"
@@ -388,13 +388,12 @@ verifyImage() {
debug "Failed to download checksum" debug "Failed to download checksum"
fi fi
checksum=$(grep "${IB_ARCHIVE##*/}" "$SHA256_FILE") # | cut -f1 -d' ') for file in "$FACTORYIMGGZFNAME" "$SYSUPGRADEIMGGZFNAME"; do
checksum=$(grep "$file" "$SHA256_FILE" | cut -f1 -d' ')
debug "checksum: $checksum" debug "checksum: $checksum"
echo "$checksum $file" | sha256sum --check --status
echo "$checksum ${IB_ARCHIVE##*/}" | sha256sum --check --status
debug "checksum return code: $?" debug "checksum return code: $?"
done
fi fi
} }
@@ -719,6 +718,7 @@ main() {
declare -g FACTORYIMG="$img_prefix-factory.img" declare -g FACTORYIMG="$img_prefix-factory.img"
declare -g FACTORYIMGGZ="$img_prefix-factory.img.gz" declare -g FACTORYIMGGZ="$img_prefix-factory.img.gz"
declare -g FACTORYIMGGZFNAME="${FACTORYIMGGZ##*/}"
declare -g SYSUPGRADEIMG="$img_prefix-sysupgrade.img" declare -g SYSUPGRADEIMG="$img_prefix-sysupgrade.img"
declare -g SYSUPGRADEIMGGZ="$img_prefix-sysupgrade.img.gz" declare -g SYSUPGRADEIMGGZ="$img_prefix-sysupgrade.img.gz"
declare -g SYSUPGRADEIMGGZFNAME="${SYSUPGRADEIMGGZ##*/}" declare -g SYSUPGRADEIMGGZFNAME="${SYSUPGRADEIMGGZ##*/}"