From 0cb936d64d82477846ee70391837cacb149a4f4a Mon Sep 17 00:00:00 2001 From: Kroese Date: Sat, 4 May 2024 19:12:58 +0200 Subject: [PATCH] Update install.sh (#455) --- src/install.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/install.sh b/src/install.sh index 5b30bef..eaf09e5 100644 --- a/src/install.sh +++ b/src/install.sh @@ -295,16 +295,15 @@ verifyFile() { local total="$3" local check="$4" - if [[ "$total" != "$size" ]]; then - if [ -n "$size" ] && [[ "$size" != "0" ]]; then - warn "The download file has an unexpected size: $total" - fi + if [ -n "$size" ] && [[ "$total" != "$size" ]]; then + [[ "$size" != "0" ]] && warn "The download file has an unexpected size: $total" fi local hash="" local algo="SHA256" [ -z "$check" ] && return 0 + [[ "$VERIFY" != [Yy1]* ]] && return 0 [[ "${#check}" == "40" ]] && algo="SHA1" local msg="Verifying downloaded ISO..." @@ -365,9 +364,7 @@ downloadFile() { if (( rc == 0 )) && [ -f "$iso" ]; then total=$(stat -c%s "$iso") if [ "$total" -gt 100000000 ]; then - if [[ "$VERIFY" == [Yy1]* ]] && [ -n "$sum" ]; then - ! verifyFile "$iso" "$size" "$total" "$sum" && return 1 - fi + ! verifyFile "$iso" "$size" "$total" "$sum" && return 1 html "Download finished successfully..." && return 0 fi fi