Merge pull request #346 from ExtremeFiretop/ExtremeFiretop-patch-1

Update Blocked Models (Readme and Script)

Author: Martinski4GitHub

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: 2024-Oct-13
+# Last Modified: 2024-Oct-19
 ###################################################################
 set -u
 
 ## Set version for each Production Release ##
-readonly SCRIPT_VERSION=1.3.3
+readonly SCRIPT_VERSION=1.3.4
 readonly SCRIPT_NAME="MerlinAU"
 ## Set to "master" for Production Releases ##
 SCRIPT_BRANCH="dev"
@@ -2302,10 +2302,13 @@ check_version_support()
     then MinFirmwareVerCheckFailed=true ; fi
 }
 
+##------------------------------------------##
+## Modified by ExtremeFiretop [2024-Oct-19] ##
+##------------------------------------------##
 check_model_support()
 {
     # List of unsupported models as a space-separated string
-    local unsupported_models="RT-AC87U RT-AC56U RT-AC66U RT-AC3200 RT-N66U RT-AC88U RT-AC5300 RT-AC3100 RT-AC68U RT-AC66U_B1 RT-AC1900 DSL-AC68U"
+    local unsupported_models="RT-AC87U RT-AC56U RT-AC66U RT-AC3200 RT-AC88U RT-AC5300 RT-AC3100 RT-AC68U RT-AC66U_B1 RT-AC68UF RT-AC68P RT-AC1900P RT-AC1900 RT-N66U RT-N16 DSL-AC68U"
 
     # Get the current model
     local current_model="$(_GetRouterProductID_)"

README.md

@@ -82,25 +82,30 @@ It streamlines the firmware update procedure, automatically detects your router
 
 - Automatic router model detection and Automatic update detection.
 - Automatically install updates to your router with the latest firmware from the Asuswrt-Merlin repository.
-- Logic to manage cron jobs for automated firmware update checks.
+- Logic to customize scheduled cron jobs for automated firmware update checks.
 - Notifications for new script updates and download the latest version of MerlinAU
 - User configurable wait periods. Wait for a set duration after a new firmware release.
-- Easy Enable/Disable: A menu switch for automatic update checking.
-- Easy Uninstall: A routine to cleanly uninstall the script, removing all related files and settings.
-- Logging and Cleanup: The script maintains logs for its operations and includes functions for cleanup tasks.
-- Blinking LEDs: A visual indicator before starting the firmware update.
-- Changelog verification check: Checks the changelogs for very obvious red flags and prompts for approval.
-- Checks RAM usage: Functions to check and manage available memory for firmware update operations.
+- Menu switch to enable or disable automatic update checking within MerlinAU.
+- A routine to cleanly uninstall the script, removing all related files and settings.
+- Maintains logs for its update checks and flash operations which can be viewed from the logs menu
+- Includes functions for cleanup tasks pre-flash and post-flash.
+- A visual indicator before starting the firmware update.
+- Checks the changelogs for very obvious red flags and prompts for approval.
+- Menu option and notifications to pre-approve the changelog verification if enabled with risks before the flash.
+- Ability to download the latest changelog notes for manual review from the logs menu.
+- Functions to check and manage available memory for firmware update operations.
 - Compatible with ROG and non-ROG routers; select ROG or Pure Build for ROG routers.
 - Backup the new firmware version to the USB drive. (If USB is selected for storage)
-- Email notifications if you configured email options in AMTM.
+- Email notifications if you configured email options in AMTM. (With format selection in the advanced options)
 - Automatic backup with BACKUPMON if installed.
 - Allow or Block Alpha/Beta upgrades to Production versions of the same cycle.
   (388.6.alpha1 or 388.6.beta1 --> 388.6.0)
 - Automatically stops all Entware services, if installed, before the flash.
 - Automatically stops diversion, if installed, before the flash.
 - Unmounts any physically attached storage via USB as the last step before the flash.
 - AiMesh Node Update Check from Primary Router. (No Flashing from Primary, MerlinAU needs to be on each node for flashing)
+- Automatically remove any loaded cron jobs from third party scripts before flashing.
+- Menu switch to keep Tailscale or ZeroTier VPN access active while flashing over SSH in the advanced menu.
 
 ## Installation
 Before using MerlinAU, ensure the following prerequisites are met:

version.txt

@@ -1 +1 @@
-1.3.3
+1.3.4