Merge pull request #4736 from AuxXxilium/dev

arc: fix restore from online
This commit is contained in:
AuxXxilium
2024-11-17 16:38:50 +01:00
committed by GitHub

View File

@@ -730,7 +730,7 @@ function backupMenu() {
MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
if [ -n "${MODEL}" ] && [ -n "${PRODUCTVER}" ]; then
TEXT="Installation found:\nModel: ${MODELID:-${MODEL}}\nVersion: ${PRODUCTVER}"
TEXT="Config found:\nModel: ${MODELID:-${MODEL}}\nVersion: ${PRODUCTVER}"
SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
TEXT+="\nSerial: ${SN}"
ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
@@ -830,6 +830,23 @@ function backupMenu() {
dialog --backtitle "$(backtitle)" --title "Online Restore" --msgbox "Online Restore failed!" 5 40
[ -f "${USER_CONFIG_FILE}.bak" ] && mv -f "${USER_CONFIG_FILE}.bak" "${USER_CONFIG_FILE}"
fi
MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
MODELID="$(readConfigKey "modelid" "${USER_CONFIG_FILE}")"
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
if [ -n "${MODEL}" ] && [ -n "${PRODUCTVER}" ]; then
TEXT="Config found:\nModel: ${MODELID:-${MODEL}}\nVersion: ${PRODUCTVER}"
SN="$(readConfigKey "sn" "${USER_CONFIG_FILE}")"
TEXT+="\nSerial: ${SN}"
ARCPATCH="$(readConfigKey "arc.patch" "${USER_CONFIG_FILE}")"
TEXT+="\nArc Patch: ${ARCPATCH}"
dialog --backtitle "$(backtitle)" --title "Online Restore" \
--aspect 18 --msgbox "${TEXT}" 0 0
PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
fi
;;
5)
if [ -f "${USER_CONFIG_FILE}" ]; then