From e218db85112e55ef636accf9f77d47ebacd971a9 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sat, 16 Nov 2024 23:15:41 +0100 Subject: [PATCH] arc: fix logic Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 4 +++- files/initrd/opt/arc/include/update.sh | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index a997ae25..5c6c1b19 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -91,6 +91,8 @@ function arcModel() { STEP="model" if [ ! -f "${S_FILE}" ] || [ ! -f "${P_FILE}" ]; then updateConfigs + else + checkHardwareID fi dialog --backtitle "$(backtitlep)" --title "Model" \ --infobox "Reading Models..." 3 25 @@ -955,7 +957,7 @@ else b) addonMenu; NEXT="b" ;; d) modulesMenu; NEXT="d" ;; e) ONLYVERSION="true" && arcVersion; NEXT="e" ;; - p) ONLYPATCH="true" && arcPatch; NEXT="p" ;; + p) ONLYPATCH="true" && checkHardwareID && arcPatch; NEXT="p" ;; S) storageMenu; NEXT="S" ;; o) dtsMenu; NEXT="o" ;; g) governorMenu; NEXT="g" ;; diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh index cf0b2a95..925a0405 100755 --- a/files/initrd/opt/arc/include/update.sh +++ b/files/initrd/opt/arc/include/update.sh @@ -265,7 +265,7 @@ function updateModules() { sleep 3 idx=$((${idx} + 1)) done - if [ -n "${TAG}" ] && [[ "${MODULESVERSION}" != "${TAG}" || ! -f "${MODULES_PATH}/${PLATFORM}-${KVERP}.tgz" ]]; then + if [ -n "${TAG}" ] && [ "${MODULESVERSION}" != "${TAG}" ]; then rm -rf "${MODULES_PATH}" mkdir -p "${MODULES_PATH}" export URL="https://github.com/AuxXxilium/arc-modules/releases/download/${TAG}/modules-${TAG}.zip"