Merge pull request #343 from ExtremeFiretop/dev

Dev 1.3.3 as Next Stable Release

Author: Martinski4GitHub

MerlinAU.sh

@@ -4,15 +4,15 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2024-Oct-04
+# Last Modified: 2024-Oct-13
 ###################################################################
 set -u
 
 ## Set version for each Production Release ##
-readonly SCRIPT_VERSION=1.3.2
+readonly SCRIPT_VERSION=1.3.3
 readonly SCRIPT_NAME="MerlinAU"
 ## Set to "master" for Production Releases ##
-SCRIPT_BRANCH="master"
+SCRIPT_BRANCH="dev"
 
 ##----------------------------------------##
 ## Modified by Martinski W. [2024-Jul-03] ##
@@ -5268,23 +5268,23 @@ _EntwareServicesHandler_()
    "$isInteractive" && printf "\nDone.\n"
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2024-Jul-29] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2024-Oct-13] ##
+##------------------------------------------##
 _GetOfflineFirmwareVersion_()
 {
     local zip_file="$1"
     local extract_version_regex='[0-9]+_[0-9]+\.[0-9]+_[0-9a-zA-Z]+'
-    local validate_version_regex='[0-9]+\.[0-9]+\.[0-9]+\.[0-9a-zA-Z]+'
+    local validate_version_regex='[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+(_[0-9a-zA-Z]+)?'
     local fwVersionFormat
 
     # Extract the version number using regex #
     firmware_version="$(echo "$zip_file" | grep -oE "$extract_version_regex")"
 
     if [ -n "$firmware_version" ]
     then
-        # Replace underscores with dots #
-        formatted_version="$(echo "$firmware_version" | sed 's/_/./g')"
+        # Replace underscores with dots and insert .0 before the suffix #
+        formatted_version="$(echo "$firmware_version" | sed -E 's/^([0-9]+)_([0-9]+\.[0-9]+)_([0-9a-zA-Z]+)/\1.\2.0_\3/')"
         printf "\nIdentified firmware version: ${GRNct}$formatted_version${NOct}\n"
         printf "\n---------------------------------------------------\n"
     else
@@ -5298,15 +5298,15 @@ _GetOfflineFirmwareVersion_()
             printf "\nFailed to identify firmware version from the ZIP file name."
         fi
         printf "\nPlease enter the firmware version number in the format ${fwVersionFormat}\n"
-        printf "\n(Examples: 3004.388.8.0 or 3004.388.8.beta1):  "
+        printf "\n(Examples: 3004.388.8.0 or 3004.388.8.0_beta1):  "
         read -r formatted_version
 
         # Validate user input #
         while ! echo "$formatted_version" | grep -qE "^${validate_version_regex}$"
         do
             printf "\n${REDct}**WARNING**${NOct} Invalid format detected!\n"
             printf "\nPlease enter the firmware version number in the format ${fwVersionFormat}\n"
-            printf "\n(i.e 3004.388.8.0 or 3004.388.8.beta1):  "
+            printf "\n(i.e 3004.388.8.0 or 3004.388.8.0_beta1):  "
             read -r formatted_version
         done
         printf "\nThe user-provided firmware version: ${GRNct}$formatted_version${NOct}\n"
@@ -5590,9 +5590,9 @@ _RunBackupmon_()
     return 0
 }
 
-##----------------------------------------##
-## Modified by Martinski W. [2024-Jul-31] ##
-##----------------------------------------##
+##------------------------------------------##
+## Modified by ExtremeFiretop [2024-Oct-13] ##
+##------------------------------------------##
 _RunOfflineUpdateNow_()
 {
     local retCode
@@ -5631,7 +5631,8 @@ _RunOfflineUpdateNow_()
     printf "\n2. No support will be offered when flashing firmware offline."
     printf "\n3. This offline feature is excluded from documentation on purpose.\n"
     printf "\nDo you acknowledge the risk and wish to proceed?"
-    printf "\nYou must type '${REDct}YES${NOct}' to continue.\n"
+    printf "\nYou must type '${REDct}YES${NOct}' to continue."
+    printf "\n---------------------------------------------------\n"
 
     read -r response
     if [ "$response" = "YES" ]

README.md

@@ -1,8 +1,8 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
-## v1.3.2
-## 2024-10-08
+## v1.3.3
+## 2024-10-18
 
-![image](https://github.com/user-attachments/assets/b033a097-6f05-441a-8430-600ca51c13b4)
+![image](https://github.com/user-attachments/assets/2c624f12-c245-41da-af4b-c1fe7ae6c16a)
 ![image](https://github.com/user-attachments/assets/847b6922-b953-4e65-acbb-6843ec08a10c)
 ![image](https://github.com/user-attachments/assets/35ed7802-9848-4a09-b9b0-93fc23cfacf8)
 ![image](https://github.com/user-attachments/assets/0c22b30b-a7d9-4e2f-b031-3f358e4f4c93)