From 7a2890e934eebb60c906ac98b63fb16f78a610e7 Mon Sep 17 00:00:00 2001 From: "Martinski@GitHub" <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 7 Jul 2024 04:14:20 -0700 Subject: [PATCH 1/5] Set the repo branch variable to "master" for production release --- MerlinAU.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 3516996a..ea2d2fbb 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,7 +4,7 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2024-Jul-03 +# Last Modified: 2024-Jul-07 ################################################################### set -u @@ -17,7 +17,7 @@ readonly SCRIPT_NAME="MerlinAU" # Script URL Info # ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="dev" +SCRIPT_BRANCH="master" readonly SCRIPT_URL_BASE="https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router" SCRIPT_URL_REPO="${SCRIPT_URL_BASE}/$SCRIPT_BRANCH" From a9baf23faa6cb020051ba54e52c38e330ea24bcf Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Tue, 9 Jul 2024 02:19:04 -0700 Subject: [PATCH 2/5] Update MerlinAU.sh Sync with current source Master branch. --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index ea2d2fbb..07c39afd 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,7 +4,7 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2024-Jul-07 +# Last Modified: 2024-Jul-03 ################################################################### set -u From 733b37efd502c933931168b08aea4a73432f7952 Mon Sep 17 00:00:00 2001 From: GitHub Actions Date: Fri, 3 Jan 2025 04:07:28 +0000 Subject: [PATCH 3/5] Update SCRIPT_BRANCH to master in MerlinAU.sh and version to 1.3.9 --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index b323a97d..475f494c 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -12,7 +12,7 @@ set -u readonly SCRIPT_VERSION=1.3.9 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="dev" +SCRIPT_BRANCH="master" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## From f675c2f69dc587474ec3e7742cbac079e8f6f916 Mon Sep 17 00:00:00 2001 From: "Martinski@GitHub" <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sat, 4 Jan 2025 17:48:23 -0800 Subject: [PATCH 4/5] Update MerlinAU.sh Syncing... --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 475f494c..b323a97d 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -12,7 +12,7 @@ set -u readonly SCRIPT_VERSION=1.3.9 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="master" +SCRIPT_BRANCH="dev" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## From c9b5b163b8998316778da85809c0fab8268be34e Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 6 Jan 2025 23:16:43 -0800 Subject: [PATCH 5/5] Code Improvements Minor code improvements to handle downloading & installing future updates. --- MerlinAU.sh | 18 +++++++++--------- README.md | 4 ++-- version.txt | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index b323a97d..f65591e8 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,12 +4,12 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Jan-01 +# Last Modified: 2025-Jan-06 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.3.9 +readonly SCRIPT_VERSION=1.3.10 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -1521,9 +1521,9 @@ _CheckForNewGUIVersionUpdate_() return "$retCode" } -##-------------------------------------## -## Added by Martinski W. [2025-Jan-01] ## -##-------------------------------------## +##----------------------------------------## +## Modified by Martinski W. [2025-Jan-06] ## +##----------------------------------------## _CurlFileDownload_() { if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ] @@ -1532,7 +1532,7 @@ _CurlFileDownload_() curl -LSs --retry 4 --retry-delay 5 --retry-connrefused \ "$1" -o "$tempFilePathDL" - if [ $? -ne 0 ] && [ ! -s "$tempFilePathDL" ] || \ + if [ $? -ne 0 ] || [ ! -s "$tempFilePathDL" ] || \ grep -iq "^404: Not Found" "$tempFilePathDL" then rm -f "$tempFilePathDL" ; retCode=1 else mv -f "$tempFilePathDL" "$2" ; retCode=0 @@ -1541,7 +1541,7 @@ _CurlFileDownload_() } ##----------------------------------------## -## Modified by Martinski W. [2025-Jan-01] ## +## Modified by Martinski W. [2025-Jan-06] ## ##----------------------------------------## _SCRIPTUPDATE_() { @@ -1582,7 +1582,7 @@ _SCRIPTUPDATE_() [ -s "$SCRIPTVERPATH" ] && urlScriptVers="$(cat "$SCRIPTVERPATH")" if [ $# -gt 1 ] && [ "$2" = "newgui" ] && \ _CheckForNewGUIVersionUpdate_ "$theScriptVers" "$urlScriptVers" - then extraParam="forceupdate" ; fi + then extraParam="install" ; fi _ReleaseLock_ exec "$ScriptFilePath" $extraParam exit 0 @@ -1630,7 +1630,7 @@ _SCRIPTUPDATE_() printf "\n$(date) - $SCRIPT_NAME - Successfully downloaded $SCRIPT_NAME v${DLRepoVersion}\n" printf "${CYANct}Update successful! Restarting script...${NOct}\n" sleep 1 - _CheckForNewGUIVersionUpdate_ && extraParam="forceupdate" + _CheckForNewGUIVersionUpdate_ && extraParam="install" _ReleaseLock_ exec "$ScriptFilePath" $extraParam exit 0 diff --git a/README.md b/README.md index 2009f5f8..6d084cc5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.3.9 -## 2025-Jan-02 +## v1.3.10 +## 2025-Jan-06 ![image](https://github.com/user-attachments/assets/185f9fe4-acdb-419a-8154-ab6fa6e0fd46) ![image](https://github.com/user-attachments/assets/8f22818d-2118-4c47-a54a-e54fb147fd6b) diff --git a/version.txt b/version.txt index d4c4950a..0c00f610 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.3.9 +1.3.10