From c71815bc91244859f2386412219bcbd5f9ae851a Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Wed, 12 Jul 2023 00:55:13 +0200
Subject: [PATCH] Ports: Move handling for simple downloads into a separate
 function

---
 Ports/.port_include.sh | 97 ++++++++++++++++++++++--------------------
 1 file changed, 52 insertions(+), 45 deletions(-)

diff --git a/Ports/.port_include.sh b/Ports/.port_include.sh
index 9dc45681da..f6ef6caab9 100755
--- a/Ports/.port_include.sh
+++ b/Ports/.port_include.sh
@@ -310,57 +310,64 @@ do_download_file() {
     fi
 }
 
+fetch_simple() {
+    url="${1}"
+    filename="${2}"
+    checksum="${3}"
+
+    tried_download_again=0
+
+    while true; do
+        do_download_file "${url}" "${PORT_META_DIR}/${filename}"
+
+        actual_checksum="$(sha256sum "${PORT_META_DIR}/${filename}" | cut -f1 -d' ')"
+
+        if [ "${actual_checksum}" = "${checksum}" ]; then
+            break
+        fi
+
+        echo "SHA256 checksum of downloaded file '${filename}' does not match!"
+        echo "Expected: ${checksum}"
+        echo "Actual:   ${actual_checksum}"
+        rm -f "${PORT_META_DIR}/${filename}"
+        echo "Removed erroneous download."
+        if [ "${tried_download_again}" -eq 1 ]; then
+            echo "Please run script again."
+            exit 1
+        fi
+        echo "Trying to download the file again."
+        tried_download_again=1
+    done
+
+    if [ ! -f "$workdir"/.${filename}_extracted ]; then
+        case "$filename" in
+            *.tar.gz|*.tar.bz|*.tar.bz2|*.tar.xz|*.tar.lz|*.tar.zst|.tbz*|*.txz|*.tgz)
+                run_nocd tar -xf "${PORT_META_DIR}/${filename}"
+                run touch ".${filename}_extracted"
+                ;;
+            *.gz)
+                run_nocd gunzip "${PORT_META_DIR}/${filename}"
+                run touch ".${filename}_extracted"
+                ;;
+            *.zip)
+                run_nocd bsdtar xf "${PORT_META_DIR}/${filename}" || run_nocd unzip -qo "${PORT_META_DIR}/${filename}"
+                run touch ".${filename}_extracted"
+                ;;
+            *)
+                echo "Note: no case for file $filename."
+                cp "${PORT_META_DIR}/${filename}" ./
+                ;;
+        esac
+    fi
+}
+
 # FIXME: Don't allow overriding fetch, support multiple protocols instead. See #20004
 func_defined fetch || fetch() {
     pre_fetch
 
     for f in "${files[@]}"; do
         read url filename auth_sum <<< $(echo "${f}")
-
-        tried_download_again=0
-
-        while true; do
-            do_download_file "$url" "${PORT_META_DIR}/${filename}"
-
-            calc_sum="$(sha256sum "${PORT_META_DIR}/${filename}" | cut -f1 -d' ')"
-
-            if [ "$calc_sum" = "$auth_sum" ]; then
-                break
-            fi
-
-            echo "SHA256 checksum of downloaded file '${filename}' does not match!"
-            echo "Expected: ${auth_sum}"
-            echo "Actual:   ${calc_sum}"
-            rm -f "${PORT_META_DIR}/${filename}"
-            echo "Removed erroneous download."
-            if [ "${tried_download_again}" -eq 1 ]; then
-                echo "Please run script again."
-                exit 1
-            fi
-            echo "Trying to download the file again."
-            tried_download_again=1
-        done
-
-        if [ ! -f "$workdir"/.${filename}_extracted ]; then
-            case "$filename" in
-                *.tar.gz|*.tar.bz|*.tar.bz2|*.tar.xz|*.tar.lz|*.tar.zst|.tbz*|*.txz|*.tgz)
-                    run_nocd tar -xf "${PORT_META_DIR}/${filename}"
-                    run touch .${filename}_extracted
-                    ;;
-                *.gz)
-                    run_nocd gunzip "${PORT_META_DIR}/${filename}"
-                    run touch .${filename}_extracted
-                    ;;
-                *.zip)
-                    run_nocd bsdtar xf "${PORT_META_DIR}/${filename}" || run_nocd unzip -qo "${PORT_META_DIR}/${filename}"
-                    run touch .${filename}_extracted
-                    ;;
-                *)
-                    echo "Note: no case for file $filename."
-                    cp "${PORT_META_DIR}/${filename}" ./
-                    ;;
-            esac
-        fi
+        fetch_simple "${url}" "${filename}" "${auth_sum}"
     done
 
     post_fetch