Skip to content

Commit dc1389f

Browse files
committed
Preserve script update download failures
1 parent d179552 commit dc1389f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

‎MerlinAU.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2995,7 +2995,7 @@ _CurlFileDownload_()
29952995
##----------------------------------------##
29962996
_DownloadScriptFiles_()
29972997
{
2998-
local retCode isUpdateAction updatedWebUIPage theWebPage
2998+
local retCode=0 isUpdateAction updatedWebUIPage theWebPage
29992999

30003000
if [ $# -gt 0 ] && [ "$1" = "update" ]
30013001
then isUpdateAction=true
@@ -3005,7 +3005,7 @@ _DownloadScriptFiles_()
30053005

30063006
if _CurlFileDownload_ "version.txt" "$SCRIPT_VERPATH"
30073007
then
3008-
retCode=0 ; chmod 664 "$SCRIPT_VERPATH"
3008+
chmod 664 "$SCRIPT_VERPATH"
30093009
else
30103010
retCode=1
30113011
Say "${REDct}**ERROR**${NOct}: Unable to download latest version file for $SCRIPT_NAME."
@@ -3014,7 +3014,6 @@ _DownloadScriptFiles_()
30143014
if "$mountWebGUI_OK" && \
30153015
_CurlFileDownload_ "$SCRIPT_WEB_ASP_FILE" "$SCRIPT_WEB_ASP_PATH"
30163016
then
3017-
retCode=0
30183017
dos2unix "$SCRIPT_WEB_ASP_PATH"
30193018
chmod 664 "$SCRIPT_WEB_ASP_PATH"
30203019
if "$updatedWebUIPage"
@@ -3036,7 +3035,6 @@ _DownloadScriptFiles_()
30363035

30373036
if _CurlFileDownload_ "${SCRIPT_NAME}.sh" "$ScriptFilePath"
30383037
then
3039-
retCode=0
30403038
dos2unix "$ScriptFilePath"
30413039
chmod 755 "$ScriptFilePath"
30423040
else

0 commit comments

Comments
 (0)