From 529ef75b474c1e3558b27deb4e17285de3aecb95 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Thu, 15 May 2025 19:39:39 -0400 Subject: [PATCH 1/5] Update MerlinAU.sh --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 29679242..cf4a26ad 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -12,7 +12,7 @@ set -u readonly SCRIPT_VERSION=1.4.5 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="master" +SCRIPT_BRANCH="dev" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## From 9f10d291e8c9e9ef8790fdcc5ed7aa7e25601302 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Sat, 17 May 2025 15:11:35 -0400 Subject: [PATCH 2/5] Update MerlinAU.sh --- MerlinAU.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index cf4a26ad..dcca78b5 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -8701,7 +8701,7 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or if ! _CheckTimeToUpdateFirmware_ "$current_version" "$release_version" then "$inMenuMode" && _WaitForEnterKey_ "$mainMenuReturnPromptStr" - return 0 + return 1 fi fi From 8f3c29850eb25169bf24db0baf956a69ce996345 Mon Sep 17 00:00:00 2001 From: ExtremeFiretop Date: Sat, 17 May 2025 15:12:50 -0400 Subject: [PATCH 3/5] Update MerlinAU.sh --- MerlinAU.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index dcca78b5..6abbad53 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-May-11 +# Last Modified: 2025-May-17 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.5 +readonly SCRIPT_VERSION=1.4.6 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -8549,7 +8549,7 @@ _RunOfflineUpdateNow_() } ##------------------------------------------## -## Modified by ExtremeFiretop [2025-May-05] ## +## Modified by ExtremeFiretop [2025-May-17] ## ##------------------------------------------## _RunFirmwareUpdateNow_() { From 2ed3f017ef8f81b1a4e737e0b542257fc4643650 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 17 May 2025 15:16:14 -0400 Subject: [PATCH 4/5] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7b901dc0..170e88e0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.4.5 -## 2025-May-15 +## v1.4.6 +## 2025-May-17 ## WebUI: ![image](https://github.com/user-attachments/assets/a2197262-ca35-451a-8645-311896e1495e) From 699505c8d6b42be6b8c3e2f25d37f590503bacc4 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 17 May 2025 15:16:34 -0400 Subject: [PATCH 5/5] Update version.txt --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index e516bb9d..c514bd85 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.4.5 +1.4.6