From 103c99d29151cded9608c0d037b8a8f0ffe83390 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Wed, 2 Oct 2024 21:15:20 +0200 Subject: [PATCH 1/2] arc/update: remove "dev" from update versions Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 2 +- files/initrd/opt/arc/include/update.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 3931403e..87f5c885 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -1938,7 +1938,7 @@ function decryptMenu() { CONFIGSVERSION="$(cat "${MODEL_CONFIG_PATH}/VERSION")" cp -f "${S_FILE}" "${S_FILE}.bak" dialog --backtitle "$(backtitle)" --colors --title "Arc Decrypt" \ - --inputbox "Enter Decryption Key for ${CONFIGSVERSION}\nKey is available in my Discord." 8 50 2>"${TMP_PATH}/resp" + --inputbox "Enter Decryption Key for ${CONFIGSVERSION} !\nKey is available in my Discord:\nhttps://discord.auxxxilium.tech" 9 50 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && return ARCKEY=$(cat "${TMP_PATH}/resp") if openssl enc -in "${S_FILE_ENC}" -out "${S_FILE_ARC}" -d -aes-256-cbc -k "${ARCKEY}" 2>/dev/null; then diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh index 2ea9910d..4f3af2d8 100755 --- a/files/initrd/opt/arc/include/update.sh +++ b/files/initrd/opt/arc/include/update.sh @@ -10,9 +10,9 @@ function upgradeLoader () { idx=0 while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break if [ "${ARCNIC}" == "auto" ]; then - local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | sort -rV | head -1)" + local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)" else - local TAG="$(curl --interface ${ARCNIC} -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | sort -rV | head -1)" + local TAG="$(curl --interface ${ARCNIC} -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)" fi if [ -n "${TAG}" ]; then break @@ -107,9 +107,9 @@ function updateLoader() { idx=0 while [ ${idx} -le 5 ]; do # Loop 5 times, if successful, break if [ "${ARCNIC}" == "auto" ]; then - local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | sort -rV | head -1)" + local TAG="$(curl -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)" else - local TAG="$(curl --interface ${ARCNIC} -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | sort -rV | head -1)" + local TAG="$(curl --interface ${ARCNIC} -m 10 -skL "https://api.github.com/repos/AuxXxilium/arc/releases" | jq -r ".[].tag_name" | grep -v "dev" | sort -rV | head -1)" fi if [ -n "${TAG}" ]; then break From 7bc8857fb01a042f65c93f5fdd16f1a26307205a Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Wed, 2 Oct 2024 22:02:59 +0200 Subject: [PATCH 2/2] arc: fix Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index a29b6936..17cfb968 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -501,7 +501,6 @@ function arcVersion() { fi if [ ${DEVICENIC} -gt 1 ]; then initConfigKey "addons.multismb3" "" "${USER_CONFIG_FILE}" - initConfigKey "addons.sortnetif" "" "${USER_CONFIG_FILE}" fi if [ -n "${ARCCONF}" ]; then initConfigKey "addons.arcdns" "" "${USER_CONFIG_FILE}"