yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix other checklist

Browse Source
This commit is contained in:
Ing 2023-06-24 00:58:14 +08:00
parent 1eba67870d
commit bbca7ba5e6
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -252,12 +252,12 @@ function addonMenu() {
--msgbox "$(TEXT "No user addons to remove")" 0 0 --msgbox "$(TEXT "No user addons to remove")" 0 0
continue continue
fi fi
ITEMS="" rm -f "${TMP_PATH}/opts"
for I in "${!ADDONS[@]}"; do for I in "${!ADDONS[@]}"; do
ITEMS+="${I} ${I} off " echo "\"${I}\" \"${I}\" \"off\"" >>"${TMP_PATH}/opts"
done done
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Addons")" \
--no-tags --checklist "$(TEXT "Select addon to remove")" 0 0 0 ${ITEMS} \ --no-tags --checklist "$(TEXT "Select addon to remove")" 0 0 0 --file "${TMP_PATH}/opts" \
2>"${TMP_PATH}/resp" 2>"${TMP_PATH}/resp"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
ADDON="$(<"${TMP_PATH}/resp")" ADDON="$(<"${TMP_PATH}/resp")"
@ -519,12 +519,12 @@ function cmdlineMenu() {
--msgbox "$(TEXT "No user cmdline to remove")" 0 0 --msgbox "$(TEXT "No user cmdline to remove")" 0 0
continue continue
fi fi
ITEMS="" rm -f "${TMP_PATH}/opts"
for I in "${!CMDLINE[@]}"; do for I in "${!CMDLINE[@]}"; do
[ -z "${CMDLINE[${I}]}" ] && ITEMS+="${I} \"\" off " || ITEMS+="${I} ${CMDLINE[${I}]} off " echo "\"${I}\" \"${CMDLINE[${I}]}\" \"off\"" >>"${TMP_PATH}/opts"
done done
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Cmdline")" \
--checklist "$(TEXT "Select cmdline to remove")" 0 0 0 ${ITEMS} \ --checklist "$(TEXT "Select cmdline to remove")" 0 0 0 --file "${TMP_PATH}/opts" \
2>"${TMP_PATH}/resp" 2>"${TMP_PATH}/resp"
[ $? -ne 0 ] && continue [ $? -ne 0 ] && continue
RESP=$(<"${TMP_PATH}/resp") RESP=$(<"${TMP_PATH}/resp")
@ -660,7 +660,6 @@ function synoinfoMenu() {
continue continue
fi fi
rm -f "${TMP_PATH}/opts" rm -f "${TMP_PATH}/opts"
ITEMS=""
for I in ${!SYNOINFO[@]}; do for I in ${!SYNOINFO[@]}; do
echo "\"${I}\" \"${SYNOINFO[${I}]}\" \"off\"" >>"${TMP_PATH}/opts" echo "\"${I}\" \"${SYNOINFO[${I}]}\" \"off\"" >>"${TMP_PATH}/opts"
done done
@ -1068,19 +1067,19 @@ function advancedMenu() {
--msgbox "${MSG}" 0 0 --msgbox "${MSG}" 0 0
;; ;;
f) f)
ITEMS="" rm -f "${TMP_PATH}/opts"
while read POSITION NAME; do while read POSITION NAME; do
[ -z "${POSITION}" -o -z "${NAME}" ] && continue [ -z "${POSITION}" -o -z "${NAME}" ] && continue
echo "${POSITION}" | grep -q "${LOADER_DEVICE_NAME}" && continue echo "${POSITION}" | grep -q "${LOADER_DEVICE_NAME}" && continue
ITEMS+="$(printf "%s %s off " "${POSITION}" "${NAME}")" echo "\"${POSITION}\" \"${NAME}\" \"off\"" >>"${TMP_PATH}/opts"
done < <(ls -l /dev/disk/by-id/ | sed 's|../..|/dev|g' | grep -E "/dev/sd*" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1) done < <(ls -l /dev/disk/by-id/ | sed 's|../..|/dev|g' | grep -E "/dev/sd*" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1)
while read POSITION NAME; do while read POSITION NAME; do
[ -z "${POSITION}" -o -z "${NAME}" ] && continue [ -z "${POSITION}" -o -z "${NAME}" ] && continue
echo "${POSITION}" | grep -q "${LOADER_DEVICE_NAME}" && continue echo "${POSITION}" | grep -q "${LOADER_DEVICE_NAME}" && continue
ITEMS+="$(printf "%s %s off " "${POSITION}" "${NAME}")" echo "\"${POSITION}\" \"${NAME}\" \"off\"" >>"${TMP_PATH}/opts"
done < <(ls -l /dev/disk/by-path/ | sed 's|../..|/dev|g' | grep -E "/dev/sd*" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1) done < <(ls -l /dev/disk/by-path/ | sed 's|../..|/dev|g' | grep -E "/dev/sd*" | awk -F' ' '{print $NF" "$(NF-2)}' | sort -uk 1,1)
dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \ dialog --backtitle "$(backtitle)" --colors --title "$(TEXT "Advanced")" \
--checklist "$(TEXT "Advanced")" 0 0 0 ${ITEMS} \ --checklist "$(TEXT "Advanced")" 0 0 0 --file "${TMP_PATH}/opts" \
2>${TMP_PATH}/resp 2>${TMP_PATH}/resp
[ $? -ne 0 ] && return [ $? -ne 0 ] && return
RESP=$(<"${TMP_PATH}/resp") RESP=$(<"${TMP_PATH}/resp")