Skip to content

Preserve failures during MerlinAU self-update #606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 1 commit into from
Sep 24, 2026
+3 −5
Merged

Preserve failures during MerlinAU self-update #606

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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."
Expand All @@ -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"
Expand All @@ -3036,7 +3035,6 @@ _DownloadScriptFiles_()

if _CurlFileDownload_ "${SCRIPT_NAME}.sh" "$ScriptFilePath"
then
retCode=0
dos2unix "$ScriptFilePath"
chmod 755 "$ScriptFilePath"
else
Expand Down
Loading