From 0a7db3b4bbf8c49a9dbc65c1d0dfaf009afda84f Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 27 Dec 2024 15:33:48 +0100 Subject: [PATCH] arc: rewrite logic and cleanup Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 20 ++++++++-------- files/initrd/opt/arc/arc.sh | 34 +++++++++++++-------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 67cffbe8..2f221417 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -2408,25 +2408,24 @@ function genHardwareID() { HWID="$(genHWID)" while true; do USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)" - if echo "${USERID}" | grep -vq "Hardware ID"; then - dialog --backtitle "$(backtitle)" --title "HardwareID" \ - --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70 + if echo "${USERID}" | grep -qE '^[0-9]+$'; then writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}" writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}" - USERID="$(readConfigKey "arc.userid" "${USER_CONFIG_FILE}")" + dialog --backtitle "$(backtitle)" --title "HardwareID" \ + --msgbox "HardwareID: ${HWID}\nYour HardwareID is registered to UserID: ${USERID}!" 6 70 break else - dialog --backtitle "$(backtitle)" --title "HardwareID" \ - --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID at\nhttps://arc.auxxxilium.tech (Discord Account needed).\nPress Retry after you registered it." 8 60 - [ $? -ne 0 ] && break writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}" writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" - USERID="" + dialog --backtitle "$(backtitle)" --title "HardwareID" \ + --yes-label "Retry" --no-label "Cancel" --yesno "HardwareID: ${HWID}\nRegister your HardwareID at\nhttps://arc.auxxxilium.tech (Discord Account needed).\nPress Retry after you registered it." 8 60 + [ $? -ne 0 ] && break continue fi done + [ -n "${USERID}" ] && ONLYPATCH="true" && arcPatch || true return } @@ -2436,12 +2435,13 @@ function checkHardwareID() { HWID="$(genHWID)" USERID="$(curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}" 2>/dev/null)" [ ! -f "${S_FILE}.bak" ] && cp -f "${S_FILE}" "${S_FILE}.bak" 2>/dev/null || true - if echo "${USERID}" | grep -vq "Hardware ID"; then + if echo "${USERID}" | grep -qE '^[0-9]+$'; then if curl -skL -m 10 "https://arc.auxxxilium.tech?hwid=${HWID}&userid=${USERID}" -o "${S_FILE}" 2>/dev/null; then writeConfigKey "arc.hardwareid" "${HWID}" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "${USERID}" "${USER_CONFIG_FILE}" writeConfigKey "bootscreen.hwidinfo" "true" "${USER_CONFIG_FILE}" else + USERID="" writeConfigKey "arc.hardwareid" "" "${USER_CONFIG_FILE}" writeConfigKey "arc.userid" "" "${USER_CONFIG_FILE}" writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" @@ -2454,7 +2454,7 @@ function checkHardwareID() { writeConfigKey "bootscreen.hwidinfo" "false" "${USER_CONFIG_FILE}" [ -f "${S_FILE}.bak" ] && mv -f "${S_FILE}.bak" "${S_FILE}" 2>/dev/null fi - return 0 + return } ############################################################################### diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 01a0c2a5..bfa12abd 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -167,7 +167,7 @@ function arcModel() { case ${RET} in 0) resp=$(cat ${TMP_PATH}/resp) - [ -z "${resp}" ] && return 1 + [ -z "${resp}" ] && return break ;; 1) @@ -180,7 +180,7 @@ function arcModel() { --title "Platform Info" --textbox "./informations/${PLATFORM}.yml" 70 80 ;; *) - return 1 + return break ;; esac @@ -242,9 +242,9 @@ function arcVersion() { dialog --clear --no-items --nocancel --title "DSM Version" --backtitle "$(backtitlep)" \ --no-items --menu "Select DSM Version" 7 30 0 ${ITEMS} \ 2>"${TMP_PATH}/resp" - [ $? -ne 0 ] && return 0 + [ $? -ne 0 ] && return resp=$(cat ${TMP_PATH}/resp) - [ -z "${resp}" ] && return 1 + [ -z "${resp}" ] && return if [ "${PRODUCTVER}" != "${resp}" ]; then PRODUCTVER="${resp}" writeConfigKey "productver" "${PRODUCTVER}" "${USER_CONFIG_FILE}" @@ -386,7 +386,7 @@ function arcVersion() { writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" ONLYVERSION="false" - return 0 + return else arcPatch fi @@ -396,7 +396,7 @@ function arcVersion() { writeConfigKey "arc.confdone" "false" "${USER_CONFIG_FILE}" CONFDONE="$(readConfigKey "arc.confdone" "${USER_CONFIG_FILE}")" sleep 5 - return 1 + return fi } @@ -478,7 +478,7 @@ function arcSettings() { --infobox "Generating Network Config..." 3 40 sleep 2 getnet - [ $? -ne 0 ] && return 1 + [ $? -ne 0 ] && return fi if [ "${ONLYPATCH}" = "true" ]; then writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" @@ -493,7 +493,7 @@ function arcSettings() { --infobox "Generating Storage Map..." 3 40 sleep 2 getmapSelection - [ $? -ne 0 ] && return 1 + [ $? -ne 0 ] && return fi # Check for Custom Build if [ "${ARCMODE}" = "config" ]; then @@ -502,14 +502,14 @@ function arcSettings() { dialog --backtitle "$(backtitlep)" --colors --title "Addons" \ --infobox "Loading Addons Table..." 3 40 addonSelection - [ $? -ne 0 ] && return 1 + [ $? -ne 0 ] && return fi # Check for CPU Frequency Scaling & Governor if [ "${ARCMODE}" = "config" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then dialog --backtitle "$(backtitlep)" --colors --title "CPU Frequency Scaling" \ --infobox "Generating Governor Table..." 3 40 governorSelection - [ $? -ne 0 ] && return 1 + [ $? -ne 0 ] && return elif [ "${ARCMODE}" = "automated" ] && [ "${MACHINE}" = "Native" ] && readConfigMap "addons" "${USER_CONFIG_FILE}" | grep -q "cpufreqscaling"; then [ "${PLATFORM}" = "epyc7002" ] && writeConfigKey "addons.cpufreqscaling" "schedutil" "${USER_CONFIG_FILE}" || writeConfigKey "addons.cpufreqscaling" "conservative" "${USER_CONFIG_FILE}" fi @@ -563,12 +563,12 @@ function arcSettings() { 2 "No - I want to make changes" \ 2>"${TMP_PATH}/resp" resp=$(cat ${TMP_PATH}/resp) - [ -z "${resp}" ] && return 1 + [ -z "${resp}" ] && return if [ ${resp} -eq 1 ]; then arcSummary elif [ ${resp} -eq 2 ]; then dialog --clear --no-items --backtitle "$(backtitle)" - return 1 + return fi else # Build Loader @@ -702,7 +702,7 @@ function make() { writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" sleep 2 - return 1 + return fi if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ "${CONFDONE}" = "true" ] && [ -n "${PAT_URL}" ] && [ -n "${PAT_HASH}" ]; then ( @@ -717,7 +717,7 @@ function make() { writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" sleep 2 - return 1 + return fi if [ -f "${ORI_ZIMAGE_FILE}" ] && [ -f "${ORI_RDGZ_FILE}" ] && [ -f "${MOD_ZIMAGE_FILE}" ] && [ -f "${MOD_RDGZ_FILE}" ]; then MODELID="$(echo ${MODEL} | sed 's/d$/D/; s/rp$/RP/; s/rp+/RP+/')" @@ -731,7 +731,7 @@ function make() { writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" sleep 2 - return 1 + return fi } @@ -754,11 +754,11 @@ function arcFinish() { 2 "No - I want to make changes" \ 2>"${TMP_PATH}/resp" resp=$(cat ${TMP_PATH}/resp) - [ -z "${resp}" ] && return 1 + [ -z "${resp}" ] && return if [ ${resp} -eq 1 ]; then boot elif [ ${resp} -eq 2 ]; then - return 0 + return fi fi fi