From f4bc5be100ee131f198846e5ae67087bd4450d4d Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Sat, 3 Aug 2024 14:02:49 +0200
Subject: [PATCH] tree: more fixes

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

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
index 0cc5e46e..ad0d3508 100755
--- a/files/initrd/opt/arc/arc-functions.sh
+++ b/files/initrd/opt/arc/arc-functions.sh
@@ -2092,7 +2092,7 @@ function rebootMenu() {
   echo -e "network \"Arc - Restart Network Service\"" >>"${TMP_PATH}/opts"
   echo -e "recovery \"DSM - Recovery Mode\"" >>"${TMP_PATH}/opts"
   echo -e "junior \"DSM - Reinstall Mode\"" >>"${TMP_PATH}/opts"
-  if efibootmgr | grep -q "^Boot0000"; then
+  if efibootmgr | grep -q "^Boot0000" 2>/dev/null; then
     echo -e "bios \"System - BIOS/UEFI\"" >>"${TMP_PATH}/opts"
   fi
   echo -e "poweroff \"System - Shutdown\"" >>"${TMP_PATH}/opts"
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
index 5348d8ff..941d6076 100755
--- a/files/initrd/opt/arc/arc.sh
+++ b/files/initrd/opt/arc/arc.sh
@@ -1150,6 +1150,7 @@ else
       C) cloneLoader; NEXT="C" ;;
       Y) [ "${ARCDYN}" == "false" ] && ARCDYN='true' || ARCDYN='false'
         writeConfigKey "arc.dynamic" "${ARCDYN}" "${USER_CONFIG_FILE}"
+        rm -f "${TMP_PATH}/dynamic" >/dev/null 2>&1 || true
         dynCheck
         NEXT="Y"
         ;;
diff --git a/files/initrd/opt/arc/include/functions.sh b/files/initrd/opt/arc/include/functions.sh
index 22066bb6..d47868b7 100755
--- a/files/initrd/opt/arc/include/functions.sh
+++ b/files/initrd/opt/arc/include/functions.sh
@@ -652,10 +652,11 @@ function dynCheck () {
   if [ "${ARCDYN}" == "true" ] && [ "${OFFLINE}" == "false" ] && [ ! -f "${TMP_PATH}/dynamic" ]; then
     curl -skL "https://github.com/AuxXxilium/arc/archive/refs/heads/dev.zip" -o "${TMP_PATH}/dev.zip"
     unzip -qq -o "${TMP_PATH}/dev.zip" -d "${TMP_PATH}" 2>/dev/null
-    cp -rf "${TMP_PATH}/arc-dev/files/initrd/opt" "${ARC_PATH}"
+    cp -rf "${TMP_PATH}/arc-dev/files/initrd/opt/arc/"* "/opt/arc"
     rm -rf "${TMP_PATH}/arc-dev"
     rm -f "${TMP_PATH}/dev.zip"
     echo "true" >"${TMP_PATH}/dynamic"
+    clear
     exec init.sh
   elif [ "${ARCDYN}" == "false" ] || [ "${OFFLINE}" == "true" ]; then
     [ -f "${TMP_PATH}/dynamic" ] && rm -f "${TMP_PATH}/dynamic" >/dev/null 2>&1 || true