From 63e4df3652821b13a58bccf3b9da63aed46e703c Mon Sep 17 00:00:00 2001 From: Maghuro <1546139+maghuro@users.noreply.github.com> Date: Thu, 24 Sep 2026 01:48:31 +0100 Subject: [PATCH] Preserve failures during MerlinAU self-update --- MerlinAU.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 7a17e739..ae13338f 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -2991,11 +2991,11 @@ _CurlFileDownload_() } ##----------------------------------------## -## Modified by Martinski W. [2025-Mar-27] ## +## Modified by maghuro [2026-Sep-24] ## ##----------------------------------------## _DownloadScriptFiles_() { - local retCode isUpdateAction updatedWebUIPage theWebPage + local retCode=0 isUpdateAction updatedWebUIPage theWebPage if [ $# -gt 0 ] && [ "$1" = "update" ] then isUpdateAction=true @@ -3005,7 +3005,7 @@ _DownloadScriptFiles_() if _CurlFileDownload_ "version.txt" "$SCRIPT_VERPATH" then - retCode=0 ; chmod 664 "$SCRIPT_VERPATH" + chmod 664 "$SCRIPT_VERPATH" else retCode=1 Say "${REDct}**ERROR**${NOct}: Unable to download latest version file for $SCRIPT_NAME." @@ -3014,7 +3014,6 @@ _DownloadScriptFiles_() if "$mountWebGUI_OK" && \ _CurlFileDownload_ "$SCRIPT_WEB_ASP_FILE" "$SCRIPT_WEB_ASP_PATH" then - retCode=0 dos2unix "$SCRIPT_WEB_ASP_PATH" chmod 664 "$SCRIPT_WEB_ASP_PATH" if "$updatedWebUIPage" @@ -3036,7 +3035,6 @@ _DownloadScriptFiles_() if _CurlFileDownload_ "${SCRIPT_NAME}.sh" "$ScriptFilePath" then - retCode=0 dos2unix "$ScriptFilePath" chmod 755 "$ScriptFilePath" else