Merge pull request #3892 from AuxXxilium/dev

tree: fix syntax
This commit is contained in:
AuxXxilium 2024-10-02 22:58:26 +02:00 committed by GitHub
commit 120e70c3b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions

View File

@ -556,8 +556,8 @@ function arcPatch() {
writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}" writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
fi fi
elif [ "${ARCMODE}" == "config" ]; then elif [ "${ARCMODE}" == "config" ]; then
CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION" | sed -e 's/\.//g' | sed 's/[^0-9]*//g' )" CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION" | sed -e 's/\.//g' | sed 's/[^0-9]*//g')"
LOADERVERSION="$(echo "${ARC_VERSION}" | sed -e 's/\.//g' | sed 's/[^0-9]*//g' )" LOADERVERSION="$(echo "${ARC_VERSION}" | sed -e 's/\.//g' | sed 's/[^0-9]*//g')"
CONFHASHFILE="$(sha256sum "${S_FILE}" | awk '{print $1}')" CONFHASHFILE="$(sha256sum "${S_FILE}" | awk '{print $1}')"
CONFHASH="$(readConfigKey "arc.confhash" "${USER_CONFIG_FILE}")" CONFHASH="$(readConfigKey "arc.confhash" "${USER_CONFIG_FILE}")"
if [ ${CONFIGSVERSION} -lt ${LOADERVERSION} ] || [ "${CONFHASH}" != "${CONFHASHFILE}" ] || [ -z "${ARCCONF}" ]; then if [ ${CONFIGSVERSION} -lt ${LOADERVERSION} ] || [ "${CONFHASH}" != "${CONFHASHFILE}" ] || [ -z "${ARCCONF}" ]; then
@ -571,7 +571,7 @@ function arcPatch() {
[ -z "${resp}" ] && return 1 [ -z "${resp}" ] && return 1
if [ ${resp} -eq 1 ]; then if [ ${resp} -eq 1 ]; then
# Generate random Serial # Generate random Serial
SN=$(generateSerial "${MODEL}" "false" | tr '[:lower:]' '[:upper:]') SN="$(generateSerial "${MODEL}" "false" | tr '[:lower:]' '[:upper:]')"
writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}" writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 2 ]; then elif [ ${resp} -eq 2 ]; then
while true; do while true; do
@ -600,11 +600,11 @@ function arcPatch() {
[ -z "${resp}" ] && return 1 [ -z "${resp}" ] && return 1
if [ ${resp} -eq 1 ]; then if [ ${resp} -eq 1 ]; then
# Read Arc Patch from File # Read Arc Patch from File
SN=$(generateSerial "${MODEL}" "true" | tr '[:lower:]' '[:upper:]') SN="$(generateSerial "${MODEL}" "true" | tr '[:lower:]' '[:upper:]')"
writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}" writeConfigKey "arc.patch" "true" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 2 ]; then elif [ ${resp} -eq 2 ]; then
# Generate random Serial # Generate random Serial
SN=$(generateSerial "${MODEL}" "false" | tr '[:lower:]' '[:upper:]') SN="$(generateSerial "${MODEL}" "false" | tr '[:lower:]' '[:upper:]')"
writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}" writeConfigKey "arc.patch" "false" "${USER_CONFIG_FILE}"
elif [ ${resp} -eq 3 ]; then elif [ ${resp} -eq 3 ]; then
while true; do while true; do

View File

@ -13,8 +13,8 @@ checkBootLoader || die "The loader is corrupted, please rewrite it!"
BUS=$(getBus "${LOADER_DISK}") BUS=$(getBus "${LOADER_DISK}")
# Sanity Check # Sanity Check
CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION" | sed -e 's/\.//g' | sed 's/[^0-9]*//g' )" CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION" | sed -e 's/\.//g' | sed 's/[^0-9]*//g')"
LOADERVERSION="$(echo "${ARC_VERSION}" | sed -e 's/\.//g' | sed 's/[^0-9]*//g' )" LOADERVERSION="$(echo "${ARC_VERSION}" | sed -e 's/\.//g' | sed 's/[^0-9]*//g')"
CONFHASHFILE="$(sha256sum "${S_FILE}" | awk '{print $1}')" CONFHASHFILE="$(sha256sum "${S_FILE}" | awk '{print $1}')"
CONFHASH="$(readConfigKey "arc.confhash" "${USER_CONFIG_FILE}")" CONFHASH="$(readConfigKey "arc.confhash" "${USER_CONFIG_FILE}")"
[ -z "${CONFHASH}" ] && CONFHASH="${CONFHASHFILE}" [ -z "${CONFHASH}" ] && CONFHASH="${CONFHASHFILE}"