AuxXxilium/arc
1
0
Fork 0
mirror of https://github.com/AuxXxilium/arc.git synced 2024-11-23 23:49:52 +07:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

arc: only show addon options if addon is selected

Browse Source 
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
AuxXxilium 2024-07-06 00:39:56 +02:00
parent 91a94b2824
commit 27d82d58cf
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
files/initrd/opt/arc/arc-functions.sh
View File

@ -620,24 +620,25 @@ function keymapMenu() {
function storagepanelMenu() {
CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
if [ "${CONFDONE}" == "true" ]; then
dialog --backtitle "$(backtitle)" --title "StoragePanel" \
--aspect 18 --msgbox "StoragePanel Addon enabled." 0 0
ITEMS="$(echo -e "RACK_2_Bay \nRACK_4_Bay \nRACK_8_Bay \nRACK_12_Bay \nRACK_16_Bay \nRACK_24_Bay \nRACK_60_Bay \nTOWER_1_Bay \nTOWER_2_Bay \nTOWER_4_Bay \nTOWER_6_Bay \nTOWER_8_Bay \nTOWER_12_Bay \n")"
dialog --backtitle "$(backtitle)" --title "StoragePanel" \
--default-item "RACK_24_Bay" --no-items --menu "Choose a Disk Panel" 0 0 0 ${ITEMS} \
2>"${TMP_PATH}/resp"
resp=$(cat ${TMP_PATH}/resp)
[ -z "${resp}" ] && return 1
STORAGE=${resp}
ITEMS="$(echo -e "1X2 \n1X4 \n1X8 \n")"
dialog --backtitle "$(backtitle)" --title "StoragePanel" \
--default-item "1X8" --no-items --menu "Choose a M.2 Panel" 0 0 0 ${ITEMS} \
2>"${TMP_PATH}/resp"
resp=$(cat ${TMP_PATH}/resp)
[ -z "${resp}" ] && return 1
M2PANEL=${resp}
STORAGEPANEL="${STORAGE} ${M2PANEL}"
writeConfigKey "addons.storagepanel" "${STORAGEPANEL}" "${USER_CONFIG_FILE}"
while true; do
ITEMS="$(echo -e "RACK_2_Bay \nRACK_4_Bay \nRACK_8_Bay \nRACK_12_Bay \nRACK_16_Bay \nRACK_24_Bay \nRACK_60_Bay \nTOWER_1_Bay \nTOWER_2_Bay \nTOWER_4_Bay \nTOWER_6_Bay \nTOWER_8_Bay \nTOWER_12_Bay \n")"
dialog --backtitle "$(backtitle)" --title "StoragePanel" \
--default-item "RACK_24_Bay" --no-items --menu "Choose a Disk Panel" 0 0 0 ${ITEMS} \
2>"${TMP_PATH}/resp"
resp=$(cat ${TMP_PATH}/resp)
[ -z "${resp}" ] && break
STORAGE=${resp}
ITEMS="$(echo -e "1X2 \n1X4 \n1X8 \n")"
dialog --backtitle "$(backtitle)" --title "StoragePanel" \
--default-item "1X8" --no-items --menu "Choose a M.2 Panel" 0 0 0 ${ITEMS} \
2>"${TMP_PATH}/resp"
resp=$(cat ${TMP_PATH}/resp)
[ -z "${resp}" ] && break
M2PANEL=${resp}
STORAGEPANEL="${STORAGE} ${M2PANEL}"
writeConfigKey "addons.storagepanel" "${STORAGEPANEL}" "${USER_CONFIG_FILE}"
break
done
writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
fi
@ -649,8 +650,6 @@ function storagepanelMenu() {
function sequentialIOMenu() {
CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
if [ "${CONFDONE}" == "true" ]; then
dialog --backtitle "$(backtitle)" --title "SequentialIO" \
--aspect 18 --msgbox "SequentialIO Addon enabled." 0 0
while true; do
dialog --backtitle "$(backtitle)" --cancel-label "Exit" --menu "SequentialIO" 0 0 0 \
1 "Enable for SSD Cache" \
@ -669,8 +668,9 @@ function sequentialIOMenu() {
SEQUENTIAL="false"
;;
esac
writeConfigKey "addons.sequentialio" "${SEQUENTIAL}" "${USER_CONFIG_FILE}"
break
done
writeConfigKey "addons.sequentialio" "${SEQUENTIAL}" "${USER_CONFIG_FILE}"
writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
fi

12
files/initrd/opt/arc/arc.sh
View File

@ -914,6 +914,7 @@ else
echo "b \"Addons \" " >>"${TMP_PATH}/menu"
echo "d \"Modules \" " >>"${TMP_PATH}/menu"
echo "e \"Version \" " >>"${TMP_PATH}/menu"
echo "p \"Patch Options (SN/Mac) \" " >>"${TMP_PATH}/menu"
if [ "${CPUFREQ}" == "true" ]; then
echo "g \"Frequency Scaling \" " >>"${TMP_PATH}/menu"
fi
@ -923,9 +924,12 @@ else
if [ "${DT}" == "true" ]; then
echo "o \"DTS Map Options \" " >>"${TMP_PATH}/menu"
fi
echo "P \"StoragePanel Options \" " >>"${TMP_PATH}/menu"
echo "Q \"SequentialIO Options \" " >>"${TMP_PATH}/menu"
echo "p \"Patch Options (SN/Mac) \" " >>"${TMP_PATH}/menu"
if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "storagepanel"; then
echo "P \"StoragePanel Options \" " >>"${TMP_PATH}/menu"
fi
if readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "sequentialio"; then
echo "Q \"SequentialIO Options \" " >>"${TMP_PATH}/menu"
fi
fi
if [ "${BOOTOPTS}" == "true" ]; then
echo "6 \"\Z1Hide Boot Options\Zn \" " >>"${TMP_PATH}/menu"
@ -986,7 +990,7 @@ else
echo "w \"Reset Loader to Defaults \" " >>"${TMP_PATH}/menu"
echo "C \"Clone Loader to Disk \" " >>"${TMP_PATH}/menu"
echo "F \"\Z1Formate Disks \Zn \" " >>"${TMP_PATH}/menu"
echo "h \"Screentimeout \" " >>"${TMP_PATH}/menu"
echo "h \"Screen Timeout \" " >>"${TMP_PATH}/menu"
echo "n \"Grub Bootloader Config \" " >>"${TMP_PATH}/menu"
echo "v \"Write Loader Modifications to Disk \" " >>"${TMP_PATH}/menu"
if [ "${OFFLINE}" == "false" ]; then