From 21b0f768f152c7a73799166e4ebf6acb2f56f615 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Fri, 27 Dec 2024 22:34:58 +0100
Subject: [PATCH] tree: update

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

diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh
index 24564ede..3c047e0d 100755
--- a/files/initrd/opt/arc/init.sh
+++ b/files/initrd/opt/arc/init.sh
@@ -5,24 +5,11 @@ set -e
 
 . "${ARC_PATH}/include/functions.sh"
 
-function loadArcOverlay() {
-  echo -e "\033[1;34mLoading Arc Overlay...\033[0m"
-  echo
-  echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m to configure Loader."
-
-  # Check memory and load Arc
-  RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)
-  if [ ${RAM} -le 3500 ]; then
-    echo -e "\033[1;31mYou have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of RAM.\033[0m\n\033[1;31mUse arc.sh to proceed. Not recommended!\033[0m"
-  else
-    exec arc.sh
-  fi
-}
-
 # Get Loader Disk Bus
 [ -z "${LOADER_DISK}" ] && die "Loader Disk not found!"
 checkBootLoader || die "The loader is corrupted, please rewrite it!"
 
+[ -f "${HOME}/.initialized" ] && exec arc.sh || true
 [ -f "${USER_CONFIG_FILE}" ] && sed -i "s/'/\"/g" "${USER_CONFIG_FILE}" >/dev/null 2>&1 || true
 
 BUS=$(getBus "${LOADER_DISK}")
@@ -231,5 +218,15 @@ mkdir -p "${USER_UP_PATH}"
 touch "${HOME}/.initialized"
 
 # Load Arc Overlay
-loadArcOverlay
+echo -e "\033[1;34mLoading Arc Overlay...\033[0m"
+echo
+echo -e "Use \033[1;34mDisplay Output\033[0m or \033[1;34mhttp://${IPCON}:${TTYDPORT:-7681}\033[0m to configure Loader."
+
+# Check memory and load Arc
+RAM=$(awk '/MemTotal:/ {printf "%.0f", $2 / 1024}' /proc/meminfo 2>/dev/null)
+if [ ${RAM} -le 3500 ]; then
+  echo -e "\033[1;31mYou have less than 4GB of RAM, if errors occur in loader creation, please increase the amount of RAM.\033[0m\n\033[1;31mUse arc.sh to proceed. Not recommended!\033[0m"
+else
+  exec arc.sh
+fi
 exit 0
\ No newline at end of file
diff --git a/scripts/func.sh b/scripts/func.sh
index 0b005282..4b51305c 100755
--- a/scripts/func.sh
+++ b/scripts/func.sh
@@ -503,7 +503,7 @@ function copyBuildroot() {
 
 # create arc executable
 function createArc() {
-  ./scripts/make/makeself.sh "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" --current --base64 --chown --threads=0 --quiet
+  ./scripts/make/makeself.sh "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" --current --keep --zstd --chown --threads=0 --quiet
   rm -rf "../arc/files/initrd/opt/arc"
   mkdir -p "../arc/files/initrd/opt/arc"
   mv -f "arc" "../arc/files/initrd/opt/arc/"