From ea6e6fcb08c841ad2ed22c7b5111f0e76c4c982f Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Fri, 31 May 2024 20:49:11 +0200
Subject: [PATCH] tree: fix more

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

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index 3f2a8691..49960c91 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -2092,7 +2092,7 @@ function arcNIC () {
   ETHX="$(ls /sys/class/net/ 2>/dev/null | grep eth)" # real network cards list
   # Get actual IP
   for ETH in ${ETHX}; do
-    echo "${ETH}" >>"${TMP_PATH}/opts"
+    echo -e "${ETH} \"Use ${ETH} as pirmary NIC\"" >>"${TMP_PATH}/opts"
   done
   dialog --backtitle "$(backtitle)" --title "Arc NIC" \
     --default-item "${ARCNIC}" --menu  "Choose a NIC" 0 0 0 --file "${TMP_PATH}/opts" \
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 089ffd9a..1000d194 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -875,7 +875,7 @@ else
     echo "= \"\Z4========== Info ==========\Zn \" "                                           >>"${TMP_PATH}/menu"
     echo "a \"Sysinfo \" "                                                                    >>"${TMP_PATH}/menu"
     echo "A \"Networkdiag \" "                                                                >>"${TMP_PATH}/menu"
-    echo "= \"\Z4========= System =========\Zn \" "                                           >>"${TMP_PATH}/menu"
+    echo "= \"\Z4========== System ========\Zn \" "                                           >>"${TMP_PATH}/menu"
     if [ "${CONFDONE}" = "true" ]; then
       if [ "${ARCOPTS}" = "true" ]; then
         echo "4 \"\Z1Hide Arc Options\Zn \" "                                                 >>"${TMP_PATH}/menu"
@@ -892,7 +892,6 @@ else
         echo "p \"Arc Patch Settings \" "                                                     >>"${TMP_PATH}/menu"
         echo "D \"Loader DHCP/StaticIP \" "                                                   >>"${TMP_PATH}/menu"
         echo "R \"Automated Mode: \Z4${CUSTOM}\Zn \" "                                        >>"${TMP_PATH}/menu"
-        echo "M \"Primary NIC: \Z4${ARCNIC}\Zn \" "                                           >>"${TMP_PATH}/menu"
       fi
       if [ "${ADVOPTS}" = "true" ]; then
         echo "5 \"\Z1Hide Advanced Options\Zn \" "                                            >>"${TMP_PATH}/menu"
@@ -947,12 +946,13 @@ else
       fi
     fi
     if [ "${DEVOPTS}" = "true" ]; then
-      echo "8 \"\Z1Hide Dev Options\Zn \" "                                                   >>"${TMP_PATH}/menu"
+      echo "8 \"\Z1Hide Loader Options\Zn \" "                                                >>"${TMP_PATH}/menu"
     else
-      echo "8 \"\Z1Show Dev Options\Zn \" "                                                   >>"${TMP_PATH}/menu"
+      echo "8 \"\Z1Show Loader Options\Zn \" "                                                >>"${TMP_PATH}/menu"
     fi
     if [ "${DEVOPTS}" = "true" ]; then
-      echo "= \"\Z4========== Dev ===========\Zn \" "                                         >>"${TMP_PATH}/menu"
+      echo "= \"\Z4========= Loader =========\Zn \" "                                         >>"${TMP_PATH}/menu"
+      echo "M \"Primary NIC: \Z4${ARCNIC}\Zn \" "                                             >>"${TMP_PATH}/menu"
       echo "v \"Save Modifications to Disk \" "                                               >>"${TMP_PATH}/menu"
       echo "n \"Edit Grub Config \" "                                                         >>"${TMP_PATH}/menu"
       echo "B \"Grep DSM Config Backup \" "                                                   >>"${TMP_PATH}/menu"
@@ -1007,7 +1007,6 @@ else
         fi
         NEXT="R"
         ;;
-      M) arcNIC; NEXT="M" ;;
       # Advanced Section
       5) [ "${ADVOPTS}" = "true" ] && ADVOPTS='false' || ADVOPTS='true'
         ADVOPTS="${ADVOPTS}"
@@ -1121,11 +1120,12 @@ else
         BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
         NEXT="u"
         ;;
-      # Dev Section
+      # Loader Section
       8) [ "${DEVOPTS}" = "true" ] && DEVOPTS='false' || DEVOPTS='true'
         DEVOPTS="${DEVOPTS}"
         NEXT="8"
         ;;
+      M) arcNIC; NEXT="M" ;;
       v) saveMenu; NEXT="v" ;;
       n) editGrubCfg; NEXT="n" ;;
       B) getbackup; NEXT="B" ;;
@@ -1134,7 +1134,7 @@ else
       C) cloneLoader; NEXT="C" ;;
       F) formatdisks; NEXT="F" ;;
       G) package; NEXT="G" ;;
-      # Loader Settings
+      # Misc Settings
       x) backupMenu; NEXT="x" ;;
       9) [ "${OFFLINE}" = "true" ] && OFFLINE='false' || OFFLINE='true'
         writeConfigKey "arc.offline" "${OFFLINE}" "${USER_CONFIG_FILE}"
diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh
index a6d005d0..24913665 100755
--- a/files/initrd/opt/arc/init.sh
+++ b/files/initrd/opt/arc/init.sh
@@ -194,7 +194,7 @@ for ETH in ${ETHX}; do
       else
         echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:7681\033[0m to connect to Arc via web."
         ARCNIC="$(readConfigKey "arc.nic" "${USER_CONFIG_FILE}")"
-        [ -n "${ARCNIC}" ] && writeConfigKey "arc.nic" "${ETH}" "${USER_CONFIG_FILE}"
+        [ -z "${ARCNIC}" ] && writeConfigKey "arc.nic" "${ETH}" "${USER_CONFIG_FILE}"
       fi
       ethtool -s ${ETH} wol g 2>/dev/null
       break