diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 6abb9813..28ca6ab2 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -693,7 +693,7 @@ function sequentialIOMenu() { function backupMenu() { NEXT="1" while true; do - dialog --backtitle "$(backtitle)" -title "Backup" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \ + dialog --backtitle "$(backtitle)" --title "Backup" --cancel-label "Exit" --menu "Choose an Option" 0 0 0 \ 1 "Restore Arc Config from DSM" \ 2 "Restore HW Encryption Key from DSM" \ 3 "Backup HW Encryption Key to DSM" \ @@ -822,12 +822,12 @@ function updateMenu() { NEXT="1" ARC_BRANCH="$(readConfigKey "arc.branch" "${USER_CONFIG_FILE}")" while true; do - dialog --backtitle "$(backtitle)" -title "Update" --colors --cancel-label "Exit" \ + dialog --backtitle "$(backtitle)" --title "Update" --colors --cancel-label "Exit" \ --menu "Choose an Option" 0 0 0 \ 1 "Update Loader \Z1(no reflash)\Zn" \ 2 "Update Dependencies" \ 3 "Update Arc Patch" \ - 4 "Switch Arc Branch: ${ARC_BRANCH}" \ + 4 "Switch Arc Branch: \Z1${ARC_BRANCH}\Zn" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && break case "$(cat ${TMP_PATH}/resp)" in @@ -860,28 +860,22 @@ function updateMenu() { decryptMenu ;; 4) - while true; do - dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \ - --menu "Choose a Branch" 0 0 0 \ - 1 "stable - Less Hardware support / faster Boot" \ - 2 "next - More Hardware support / slower Boot" \ - 3 "dev - Development only" \ - 2>"${TMP_PATH}/resp" - [ $? -ne 0 ] && break - case "$(cat ${TMP_PATH}/resp)" in - 1) - ARC_BRANCH="stable" - ;; - 2) - ARC_BRANCH="next" - ;; - 3) - ARC_BRANCH="dev" - ;; - esac - writeConfigKey "arc.branch" "${ARC_BRANCH}" "${USER_CONFIG_FILE}" - break - done + dialog --backtitle "$(backtitle)" --title "Switch Arc Branch" \ + --menu "Choose a Branch" 0 0 0 \ + 1 "stable - Less Hardware support / faster Boot" \ + 2 "next - More Hardware support / slower Boot" \ + 3 "dev - Development only" \ + 2>"${TMP_PATH}/opts" + [ $? -ne 0 ] && break + opts=$(cat ${TMP_PATH}/opts) + if [ ${opts} -eq 1 ]; then + ARC_BRANCH="stable" + elif [ ${opts} -eq 2 ]; then + ARC_BRANCH="next" + elif [ ${opts} -eq 3 ]; then + ARC_BRANCH="dev" + fi + writeConfigKey "arc.branch" "${ARC_BRANCH}" "${USER_CONFIG_FILE}" ;; esac done