arc: rewrite more

Signed-off-by: AuxXxilium <info@auxxxilium.tech>

files/initrd/opt/arc/arc-functions.sh

@@ -80,10 +80,10 @@ function addonSelection() {
   ADDONSINFO="$(readConfigEntriesArray "addons" "${USER_CONFIG_FILE}")"
   if [ "${STEP}" == "addons" ]; then
     dialog --backtitle "$(backtitlep)" --title "Addons" \
-      --msgbox "DSM Addons selected:\n${ADDONSINFO}" 7 70
+      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
   else
     dialog --backtitle "$(backtitle)" --title "Addons" \
-      --msgbox "DSM Addons selected:\n${ADDONSINFO}" 7 70
+      --msgbox "Addons selected:\n${ADDONSINFO}" 7 70
   fi
   return
 }
@@ -2053,7 +2053,7 @@ function getpatfiles() {
   VALID="false"
   if [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" == "false" ]; then
     rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitlep)" --colors --title "DSM Version" \
+    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
       --infobox "Downloading DSM Boot Files..." 3 40
     # Get new Files
     DSM_URL="https://raw.githubusercontent.com/AuxXxilium/arc-dsm/main/files/${MODEL/+/%2B}/${PRODUCTVER}/${PAT_HASH}.tar"
@@ -2062,7 +2062,7 @@ function getpatfiles() {
     fi
   elif [ ! -f "${DSM_FILE}" ] && [ "${ARCOFFLINE}" == "true" ]; then
     rm -f ${USER_UP_PATH}/*.tar
-    dialog --backtitle "$(backtitlep)" --colors --title "DSM Version" \
+    dialog --backtitle "$(backtitlep)" --colors --title "DSM Boot Files" \
       --msgbox "Please upload the DSM Boot File to ${USER_UP_PATH}.\nUse ${IPCON}:7304 to upload and press OK after it's finished.\nLink: https://github.com/AuxXxilium/arc-dsm/tree/main/files/${MODEL}/${PRODUCTVER}/${PAT_HASH}.tar" 8 120
     [ $? -ne 0 ] && VALID="false"
     if [ -f "${DSM_FILE}" ]; then
@@ -2073,13 +2073,13 @@ function getpatfiles() {
   fi
   mkdir -p "${UNTAR_PAT_PATH}"
   if [ "${VALID}" == "true" ]; then
-    dialog --backtitle "$(backtitlep)" --title "DSM Extraction" --aspect 18 \
-      --infobox "Copying DSM Files..." 3 40
+    dialog --backtitle "$(backtitlep)" --title "DSM Boot Files" --aspect 18 \
+      --infobox "Copying DSM Boot Files..." 3 40
     tar -xf "${DSM_FILE}" -C "${UNTAR_PAT_PATH}" 2>/dev/null
     copyDSMFiles "${UNTAR_PAT_PATH}" 2>/dev/null
   else
-    dialog --backtitle "$(backtitle)" --title "DSM Extraction" --aspect 18 \
-      --infobox "DSM Extraction failed!\nExit." 4 40
+    dialog --backtitle "$(backtitle)" --title "DSM Boot Files" --aspect 18 \
+      --infobox "DSM Boot Files extraction failed: Exit!" 4 45
     sleep 2
     return 1
   fi

files/initrd/opt/arc/arc.sh

@@ -89,7 +89,7 @@ function backtitlep() {
 # Model Selection
 function arcModel() {
   STEP="model"
-  dialog --backtitle "$(backtitlep)" --title "DSM Model" \
+  dialog --backtitle "$(backtitlep)" --title "Model" \
     --infobox "Reading Models..." 3 25
   if [ ! -f "${S_FILE}" ]; then
     updateConfigs
@@ -158,13 +158,13 @@ function arcModel() {
         fi
       done < <(cat "${TMP_PATH}/modellist")
       if [ -n "${ARCKEY}" ]; then
-        dialog --backtitle "$(backtitlep)" --title "Arc DSM Model" --colors \
+        dialog --backtitle "$(backtitlep)" --title "Arc Model" --colors \
           --cancel-label "Show all" --help-button --help-label "Exit" \
           --extra-button --extra-label "Info" \
           --menu "Supported Models for your Hardware (x = supported / + = need Addons)\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Arc" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 115 0 \
           --file "${TMP_PATH}/menu" 2>"${TMP_PATH}/resp"
       else
-        dialog --backtitle "$(backtitlep)" --title "DSM Model" --colors \
+        dialog --backtitle "$(backtitlep)" --title "Model" --colors \
           --cancel-label "Show all" --help-button --help-label "Exit" \
           --extra-button --extra-label "Info" \
           --menu "Supported Models for your Hardware (x = supported / + = need Addons) | Syno Models can have faulty Values.\n$(printf "\Zb%-16s\Zn \Zb%-15s\Zn \Zb%-5s\Zn \Zb%-12s\Zn \Zb%-5s\Zn \Zb%-10s\Zn \Zb%-12s\Zn \Zb%-10s\Zn \Zb%-10s\Zn" "Model" "Platform" "DT" "Intel iGPU" "HBA" "M.2 Cache" "M.2 Volume" "USB Mount" "Source")" 0 115 0 \
@@ -250,7 +250,7 @@ function arcVersion() {
   if [ "${ARCMODE}" == "config" ] && [ "${ARCRESTORE}" != "true" ]; then
     # Select Build for DSM
     ITEMS="$(readConfigEntriesArray "platforms.${PLATFORM}.productvers" "${P_FILE}" | sort -r)"
-    dialog --clear --no-items --nocancel --title "DSM Version" --backtitle "$(backtitlep)" \
+    dialog --clear --no-items --nocancel --title "Version" --backtitle "$(backtitlep)" \
       --no-items --menu "Choose DSM Version" 7 30 0 ${ITEMS} \
     2>"${TMP_PATH}/resp"
     [ $? -ne 0 ] && return 0
@@ -271,7 +271,7 @@ function arcVersion() {
       BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
       CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
     fi
-    dialog --backtitle "$(backtitlep)" --title "DSM Version" \
+    dialog --backtitle "$(backtitlep)" --title "Version" \
     --infobox "Reading DSM Build..." 3 25
     PAT_URL=""
     PAT_HASH=""
@@ -288,7 +288,7 @@ function arcVersion() {
         PREV="${V}"
       done < <(echo "${PVS}")
       DSMPVS="$(cat ${TMP_PATH}/versions)"
-      dialog --backtitle "$(backtitlep)" --colors --title "DSM Version" \
+      dialog --backtitle "$(backtitlep)" --colors --title "Version" \
       --no-items --menu "Choose a DSM Build" 0 0 0 ${DSMPVS} \
       2>${TMP_PATH}/resp
       RET=$?
@@ -453,7 +453,7 @@ function arcPatch() {
       writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
     elif [ ${resp} -eq 3 ]; then
       while true; do
-        dialog --backtitle "$(backtitlep)" --colors --title "DSM SN" \
+        dialog --backtitle "$(backtitlep)" --colors --title "Serial" \
           --inputbox "Please enter a valid SN!" 7 50 "" \
           2>"${TMP_PATH}/resp"
         [ $? -ne 0 ] && break 2
@@ -508,7 +508,7 @@ function arcSettings() {
   if [ "${ARCMODE}" == "config" ]; then
     # Select Addons
     STEP="addons"
-    dialog --backtitle "$(backtitlep)" --colors --title "DSM Addons" \
+    dialog --backtitle "$(backtitlep)" --colors --title "Addons" \
       --infobox "Loading Addons Table..." 3 40
     addonSelection
     [ $? -ne 0 ] && return 1
@@ -668,7 +668,7 @@ function arcSummary() {
   SUMMARY+="\n>> Internal Disks: \Zb${HARDDRIVES}\Zn"
   SUMMARY+="\n>> Additional Controller: \Zb${EXTERNALCONTROLLER}\Zn"
   SUMMARY+="\n>> Memory: \Zb${RAMTOTAL}GB\Zn"
-  dialog --backtitle "$(backtitlep)" --colors --title "DSM Config Summary" \
+  dialog --backtitle "$(backtitlep)" --colors --title "Config Summary" \
     --extra-button --extra-label "Cancel" --msgbox "${SUMMARY}" 0 0
   RET=$?
   case ${RET} in
@@ -900,7 +900,7 @@ else
       fi
       if [ "${BOOTOPTS}" == "true" ]; then
         echo "= \"\Z4========== Boot =========\Zn \" "                                        >>"${TMP_PATH}/menu"
-        echo "m \"DSM Kernelload: \Z4${KERNELLOAD}\Zn \" "                                    >>"${TMP_PATH}/menu"
+        echo "m \"Boot Kernelload: \Z4${KERNELLOAD}\Zn \" "                                    >>"${TMP_PATH}/menu"
         echo "E \"eMMC Boot Support: \Z4${EMMCBOOT}\Zn \" "                                   >>"${TMP_PATH}/menu"
         if [ "${DIRECTBOOT}" == "false" ]; then
           echo "i \"Boot IP Waittime: \Z4${BOOTIPWAIT}\Zn \" "                                >>"${TMP_PATH}/menu"
@@ -1037,8 +1037,8 @@ else
       M) mountDSM; NEXT="M" ;;
       K) [ "${KERNEL}" == "official" ] && KERNEL='custom' || KERNEL='official'
         writeConfigKey "kernel" "${KERNEL}" "${USER_CONFIG_FILE}"
-        dialog --backtitle "$(backtitle)" --title "DSM Kernel" \
-          --infobox "Switching to Custom Kernel! Stay patient..." 4 50
+        dialog --backtitle "$(backtitle)" --title "Kernel" \
+          --infobox "Switching Kernel to ${KERNEL}! Stay patient..." 4 50
         if [ "${ODP}" == "true" ]; then
           ODP="false"
           writeConfigKey "odp" "${ODP}" "${USER_CONFIG_FILE}"