mirror of
https://github.com/AuxXxilium/arc.git
synced 2024-11-24 05:19:53 +07:00
update: fix
Signed-off-by: AuxXxilium <info@auxxxilium.tech>
This commit is contained in:
parent
ac792bedba
commit
814fda8991
@ -30,6 +30,7 @@ LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
|
|||||||
if [ -n "${MODEL}" ]; then
|
if [ -n "${MODEL}" ]; then
|
||||||
DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
|
DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
|
||||||
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
||||||
|
NANOVER="$(readConfigKey "nanover" "${USER_CONFIG_FILE}")"
|
||||||
ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)"
|
ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -22,15 +22,17 @@ ARCKEY="$(readConfigKey "arc.key" "${USER_CONFIG_FILE}")"
|
|||||||
|
|
||||||
# Get DSM Data from Config
|
# Get DSM Data from Config
|
||||||
MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
|
MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")"
|
||||||
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
|
||||||
|
LKM="$(readConfigKey "lkm" "${USER_CONFIG_FILE}")"
|
||||||
if [ -n "${MODEL}" ]; then
|
if [ -n "${MODEL}" ]; then
|
||||||
PLATFORM="$(readConfigKey "platform" "${USER_CONFIG_FILE}")"
|
|
||||||
DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
|
DT="$(readConfigKey "platforms.${PLATFORM}.dt" "${P_FILE}")"
|
||||||
|
PRODUCTVER="$(readConfigKey "productver" "${USER_CONFIG_FILE}")"
|
||||||
|
NANOVER="$(readConfigKey "nanover" "${USER_CONFIG_FILE}")"
|
||||||
|
ARCCONF="$(readConfigKey "${MODEL}.serial" "${S_FILE}" 2>/dev/null)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Get Config/Build Status
|
# Get Config Status
|
||||||
CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
|
CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")"
|
||||||
BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
|
|
||||||
|
|
||||||
# Get Keymap and Timezone Config
|
# Get Keymap and Timezone Config
|
||||||
ntpCheck
|
ntpCheck
|
||||||
@ -49,7 +51,11 @@ function backtitle() {
|
|||||||
fi
|
fi
|
||||||
BACKTITLE="${ARC_TITLE} | "
|
BACKTITLE="${ARC_TITLE} | "
|
||||||
BACKTITLE+="${MODEL} | "
|
BACKTITLE+="${MODEL} | "
|
||||||
|
if [ -n "${NANOVER}" ]; then
|
||||||
|
BACKTITLE+="${PRODUCTVER}.${NANOVER} | "
|
||||||
|
else
|
||||||
BACKTITLE+="${PRODUCTVER} | "
|
BACKTITLE+="${PRODUCTVER} | "
|
||||||
|
fi
|
||||||
BACKTITLE+="${IPCON} | "
|
BACKTITLE+="${IPCON} | "
|
||||||
BACKTITLE+="Patch: ${ARCPATCH} | "
|
BACKTITLE+="Patch: ${ARCPATCH} | "
|
||||||
BACKTITLE+="Config: ${CONFDONE} | "
|
BACKTITLE+="Config: ${CONFDONE} | "
|
||||||
@ -73,8 +79,6 @@ function arcUpdate() {
|
|||||||
# Ask for Boot
|
# Ask for Boot
|
||||||
dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
|
dialog --backtitle "$(backtitle)" --title "Update Loader" --aspect 18 \
|
||||||
--infobox "Update successful!" 0 0
|
--infobox "Update successful!" 0 0
|
||||||
writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}"
|
|
||||||
BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")"
|
|
||||||
if [ "${CONFDONE}" == "true" ] && [ ! -f "${PART3_PATH}/automated" ]; then
|
if [ "${CONFDONE}" == "true" ] && [ ! -f "${PART3_PATH}/automated" ]; then
|
||||||
echo "${ARC_VERSION}-${MODEL}-${PRODUCTVER}-custom" >"${PART3_PATH}/automated"
|
echo "${ARC_VERSION}-${MODEL}-${PRODUCTVER}-custom" >"${PART3_PATH}/automated"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user