From 54c62791ac3c09dea9967f4f30ca53e9bbb12558 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 24 Jan 2025 21:55:12 +0100 Subject: [PATCH] tree: rewrite Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 12 +++++++++-- files/initrd/opt/arc/arc.sh | 29 +++++++++++++-------------- files/initrd/opt/arc/evo.sh | 8 ++++---- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index da968278..aad20ef8 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -73,9 +73,9 @@ function readData() { ############################################################################### # Advanced Menu function advancedMenu() { - rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true NEXT="a" while true; do + rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true write_menu_with_color "=" "===== Diag =====" write_menu "a" "Sysinfo" write_menu "A" "Networkdiag" @@ -109,7 +109,7 @@ function advancedMenu() { write_menu "w" "Reset Loader to Defaults" write_menu "L" "Grep Logs from dbgutils" write_menu "B" "Grep DSM Config from Backup" - write_menu_with_color "=" "== Edit with caution! ==" + write_menu "=" "\Z1== Edit with caution! ==\Zn" write_menu "C" "Clone Loader to another Disk" write_menu "n" "Grub Bootloader Config" write_menu "y" "Choose a Keymap for Loader" @@ -138,6 +138,10 @@ function advancedMenu() { a) sysinfo; NEXT="a" ;; A) networkdiag; NEXT="A" ;; # DSM Section + 7) [ "${DSMOPTS}" = "true" ] && DSMOPTS='false' || DSMOPTS='true' + DSMOPTS="${DSMOPTS}" + NEXT="7" + ;; j) cmdlineMenu; NEXT="j" ;; k) synoinfoMenu; NEXT="k" ;; l) editUserConfig; NEXT="l" ;; @@ -149,6 +153,10 @@ function advancedMenu() { T) disablescheduledTasks; NEXT="T" ;; B) getbackup; NEXT="B" ;; # Loader Section + 8) [ "${LOADEROPTS}" = "true" ] && LOADEROPTS='false' || LOADEROPTS='true' + LOADEROPTS="${LOADEROPTS}" + NEXT="8" + ;; D) staticIPMenu; NEXT="D" ;; f) bootScreen; NEXT="f" ;; Z) loaderPorts; NEXT="Z" ;; diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index e3a74f38..28ac787e 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -751,12 +751,12 @@ elif [ "${ARCMODE}" = "automated" ]; then make fi elif [ "${ARCMODE}" = "config" ]; then - [ "${CONFDONE}" = "true" ] && NEXT="2" || NEXT="1" - [ "${BUILDDONE}" = "true" ] && NEXT="3" || NEXT="1" - rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true while true; do + [ "${CONFDONE}" = "true" ] && NEXT="2" || NEXT="1" + [ "${BUILDDONE}" = "true" ] && NEXT="3" || NEXT="1" + rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true readData - echo "= \"\Z4===== Main =====\Zn \" " >"${TMP_PATH}/menu" + write_menu "\Z4===== Main =====\Zn" if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then write_menu "0" "HardwareID for Arc Patch" @@ -776,10 +776,10 @@ elif [ "${ARCMODE}" = "config" ]; then write_menu "3" "Boot Loader" fi - write_menu_with_color "=" "===== Info =====" + write_menu "=" "\Z4===== Info =====\Zn" write_menu "a" "Sysinfo" write_menu "A" "Networkdiag" - write_menu_with_color "=" "===== System ====" + write_menu "=" "\Z4===== System ====\Zn" if [ "${CONFDONE}" = "true" ]; then if [ "${ARCOPTS}" = "true" ]; then @@ -789,7 +789,7 @@ elif [ "${ARCMODE}" = "config" ]; then fi if [ "${ARCOPTS}" = "true" ]; then - write_menu_with_color "=" "==== Arc DSM ====" + write_menu "=" "\Z4==== Arc DSM ====\Zn" write_menu "b" "Addons" write_menu "d" "Modules" write_menu "e" "Version" @@ -831,7 +831,7 @@ elif [ "${ARCMODE}" = "config" ]; then fi if [ "${BOOTOPTS}" = "true" ]; then - write_menu_with_color "=" "===== Boot =====" + write_menu "=" "\Z4===== Boot =====\Zn" write_menu_with_color "m" "Boot Kernelload" "${KERNELLOAD}" write_menu_with_color "E" "eMMC Boot Support" "${EMMCBOOT}" if [ "${DIRECTBOOT}" = "false" ]; then @@ -847,7 +847,7 @@ elif [ "${ARCMODE}" = "config" ]; then fi if [ "${DSMOPTS}" = "true" ]; then - write_menu_with_color "=" "===== DSM =====" + write_menu "=" "\Z4===== DSM =====\Zn" write_menu "j" "Cmdline" write_menu "k" "Synoinfo" write_menu "N" "Add new User" @@ -868,7 +868,7 @@ elif [ "${ARCMODE}" = "config" ]; then fi if [ "${LOADEROPTS}" = "true" ]; then - write_menu_with_color "=" "===== Loader =====" + write_menu "=" "\Z4===== Loader =====\Zn" write_menu_with_color "c" "Offline Mode" "${ARCOFFLINE}" write_menu "D" "StaticIP for Loader/DSM" write_menu "f" "Bootscreen Options" @@ -877,7 +877,7 @@ elif [ "${ARCMODE}" = "config" ]; then write_menu "w" "Reset Loader to Defaults" write_menu "L" "Grep Logs from dbgutils" write_menu "B" "Grep DSM Config from Backup" - write_menu_with_color "=" "== Edit with caution! ==" + write_menu "=" "\Z1== Edit with caution! ==\Zn" write_menu_with_color "W" "RD Compression" "${RD_COMPRESSED}" write_menu_with_color "X" "Sata DOM" "${SATADOM}" write_menu_with_color "u" "LKM Version" "${LKM}" @@ -887,15 +887,14 @@ elif [ "${ARCMODE}" = "config" ]; then write_menu "F" "\Z1Formate Disks\Zn" fi - write_menu_with_color "=" "===== Misc =====" + write_menu_with_color "=" "\Z4===== Misc =====\Zn" write_menu "x" "Backup/Restore/Recovery" [ "${ARCOFFLINE}" = "false" ] && write_menu "z" "Update Menu" write_menu "I" "Power/Service Menu" write_menu "V" "Credits" - dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Arc Config" --colors \ - --cancel-label "Evo Mode" --help-button --help-label "Exit" \ - --extra-button --extra-label "${EXTRA_LABEL}" \ + dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Classic Mode" --colors \ + --cancel-label "Evo" --help-button --help-label "Exit" \ --menu "" 0 0 0 --file "${TMP_PATH}/menu" \ 2>"${TMP_PATH}/resp" RET=$? diff --git a/files/initrd/opt/arc/evo.sh b/files/initrd/opt/arc/evo.sh index efa678e1..c206be9c 100755 --- a/files/initrd/opt/arc/evo.sh +++ b/files/initrd/opt/arc/evo.sh @@ -752,11 +752,11 @@ elif [ "${ARCMODE}" = "automated" ]; then fi elif [ "${ARCMODE}" = "config" ]; then NEXT="1" - rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true while true; do + rm -f "${TMP_PATH}/menu" "${TMP_PATH}/resp" >/dev/null 2>&1 || true readData if [ -z "${USERID}" ] && [ "${ARCOFFLINE}" = "false" ]; then - write_menu "0" "HardwareID: ${HARDWAREID}" + write_menu_with_color "0" "HardwareID" "${HARDWAREID}" fi write_menu_with_color "1" "Model" "${MODEL}" @@ -835,8 +835,8 @@ elif [ "${ARCMODE}" = "config" ]; then elif [ "${BUILDDONE}" = "true" ]; then EXTRA_LABEL="Boot" fi - dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Arc Config" --colors \ - --cancel-label "Classic Mode" --help-button --help-label "Exit" \ + dialog --clear --default-item ${NEXT} --backtitle "$(backtitle)" --title "Evo Mode" --colors \ + --cancel-label "Classic" --help-button --help-label "Exit" \ --extra-button --extra-label "${EXTRA_LABEL}" \ --menu "" 0 0 0 --file "${TMP_PATH}/menu" \ 2>"${TMP_PATH}/resp"