From 5d5abfcdb671716fda7ac9cb76886f10c171bf81 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Thu, 28 Mar 2024 12:31:24 +0100
Subject: [PATCH] arc/network: cleanup

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 files/initrd/opt/arc/arc.sh             |  2 ++
 files/initrd/opt/arc/include/network.sh | 43 ++++++++-----------------
 2 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index f3701b2b..2c0fbf3c 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -13,6 +13,8 @@
 
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 
+alias DIALOG='dialog --backtitle "$(backtitle)" --colors'
+
 # Memory: Check Memory installed
 RAMFREE=$(($(free -m | grep -i mem | awk '{print$2}') / 1024 + 1))
 RAMTOTAL=$((${RAMFREE} * 1024))
diff --git a/files/initrd/opt/arc/include/network.sh b/files/initrd/opt/arc/include/network.sh
index 9fb1a34f..35c2faab 100755
--- a/files/initrd/opt/arc/include/network.sh
+++ b/files/initrd/opt/arc/include/network.sh
@@ -34,36 +34,19 @@ function getnet() {
       dialog --backtitle "$(backtitle)" --title "Mac Setting" --msgbox "Invalid MAC" 0 0
     done
   fi
-  if [ "${ARCPATCH}" = "true" ]; then
-    # Ask for Macsys
-    dialog --clear --backtitle "$(backtitle)" \
-      --nocancel --title "Macsys Setting" \
-      --menu "Choose an Option\n* Recommended Option" 10 50 0 \
-      1 "Hardware - Use Hardware Mac for DSM *" \
-      2 "Custom - Use Custom Mac for DSM" \
-    2>"${TMP_PATH}/resp"
-    resp="$(<"${TMP_PATH}/resp")"
-    [ -z "${resp}" ] && return 1
-    if [ ${resp} -eq 1 ]; then
-      writeConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 2 ]; then
-      writeConfigKey "arc.macsys" "custom" "${USER_CONFIG_FILE}"
-    fi
-  else
-    # Ask for Macsys
-    dialog --clear --backtitle "$(backtitle)" \
-      --nocancel --title "Macsys Setting" \
-      --menu "Choose an Option\n* Recommended Option" 5 50 0 \
-      1 "Hardware - Use Hardware Mac for DSM *" \
-      2 "Custom - Use Custom Mac for DSM" \
-    2>"${TMP_PATH}/resp"
-    resp="$(<"${TMP_PATH}/resp")"
-    [ -z "${resp}" ] && return 1
-    if [ ${resp} -eq 1 ]; then
-      writeConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}"
-    elif [ ${resp} -eq 2 ]; then
-      writeConfigKey "arc.macsys" "custom" "${USER_CONFIG_FILE}"
-    fi
+  # Ask for Macsys
+  dialog --clear --backtitle "$(backtitle)" \
+    --nocancel --title "Macsys Setting" \
+    --menu "Choose an Option\n* Recommended Option" 5 50 0 \
+    1 "Hardware - Use Hardware Mac for DSM *" \
+    2 "Custom - Use Custom/Fake Mac for DSM" \
+  2>"${TMP_PATH}/resp"
+  resp="$(<"${TMP_PATH}/resp")"
+  [ -z "${resp}" ] && return 1
+  if [ ${resp} -eq 1 ]; then
+    writeConfigKey "arc.macsys" "hardware" "${USER_CONFIG_FILE}"
+  elif [ ${resp} -eq 2 ]; then
+    writeConfigKey "arc.macsys" "custom" "${USER_CONFIG_FILE}"
   fi
   MACSYS="$(readConfigKey "arc.macsys" "${USER_CONFIG_FILE}")"
 }