From ae0f6a30fec853323c3ddc0fbf20bee7ed80e618 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Sun, 27 Oct 2024 21:25:02 +0100
Subject: [PATCH] arc: rewrite more

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/arc-functions.sh | 17 +++++++----------
 files/initrd/opt/arc/arc.sh           |  5 ++++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index be41ebc3..2399e7d2 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -2043,15 +2043,12 @@ function getpatfiles() {
     fi
   elif [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" == "true" ]; then
     rm -f ${USER_UP_PATH}/*.tar
-    while true; do
-      dialog --backtitle "$(backtitle)" --colors --title "DSM Version" \
-        --msgbox "Please upload the DSM Boot File to ${USER_UP_PATH}.\nLink: https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar\nUse ${IPCON}:7304 and OK after Upload" 0 0
-      [ $? -ne 0 ] && break
-      if [ -f "${DSM_FILE}" ]; then
-        VALID="true"
-        break
-      fi
-    done
+    dialog --backtitle "$(backtitle)" --colors --title "DSM Version" \
+      --msgbox "Please upload the DSM Boot File to ${USER_UP_PATH}.\nLink: https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar\nUse ${IPCON}:7304 and OK after Upload" 0 0
+    [ $? -ne 0 ] && VALID="false"
+    if [ -f "${DSM_FILE}" ]; then
+      VALID="true"
+    fi
   elif [ -f "${DSM_FILE}" ]; then
     VALID="true"
   fi
@@ -2064,7 +2061,7 @@ function getpatfiles() {
   else
     dialog --backtitle "$(backtitle)" --title "DSM Extraction" --aspect 18 \
       --infobox "DSM Extraction failed!\nExit." 4 40
-    sleep 5
+    sleep 2
   fi
   # Cleanup
   [ -d "${UNTAR_PAT_PATH}" ] && rm -rf "${UNTAR_PAT_PATH}"
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 38ffa2b0..e23400bc 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -343,6 +343,10 @@ function arcVersion() {
         writeConfigKey "paturl" "${PAT_URL}" "${USER_CONFIG_FILE}"
         writeConfigKey "pathash" "${PAT_HASH}" "${USER_CONFIG_FILE}"
       fi
+    elif [ "${ARCOFFLINE}" == "true" ]; then
+      VALID="true"
+      writeConfigKey "paturl" "${PAT_URL}" "${USER_CONFIG_FILE}"
+      writeConfigKey "pathash" "${PAT_HASH}" "${USER_CONFIG_FILE}"
     fi
   elif [ "${ARCMODE}" == "automated" ] || [ "${ARCRESTORE}" == "true" ]; then
     VALID="true"
@@ -355,7 +359,6 @@ function arcVersion() {
     rm -f "${PART1_PATH}/grub_cksum.syno" "${PART1_PATH}/GRUB_VER" >/dev/null 2>&1 || true
     rm -f "${USER_UP_PATH}/"*.tar >/dev/null 2>&1 || true
   fi
-  getpatfiles
   # Change Config if Files are valid
   if [ "${VALID}" == "true" ]; then
     dialog --backtitle "$(backtitle)" --title "Arc Config" \