Skip to content

Commit 59f4b24

Browse files
Code Improvement
Improved uninstallation workflow when users attempt to install MerlinAU on unsupported router models. Now the code will automatically ask users to uninstall right after informing them that their current router model is unsupported. On such scenarios, this provides users a quick & easy way to uninstall.
1 parent 8854210 commit 59f4b24

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

MerlinAU.sh

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#
55
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
66
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
7-
# Last Modified: 2025-Apr-11
7+
# Last Modified: 2025-Apr-12
88
###################################################################
99
set -u
1010

@@ -2280,13 +2280,13 @@ _CheckFor_VersionFile_()
22802280
}
22812281

22822282
##----------------------------------------##
2283-
## Modified by Martinski W. [2025-Jan-11] ##
2283+
## Modified by Martinski W. [2025-Apr-12] ##
22842284
##----------------------------------------##
22852285
_Unmount_WebUI_()
22862286
{
22872287
if [ ! -f "$SCRIPT_WEB_ASP_PATH" ]
22882288
then
2289-
Say "${CRITct}**ERROR**${NOct}: The WebUI page file for $SCRIPT_NAME is NOT found."
2289+
Say "${InvBYLWct}*INFO*${NOct}: The WebUI page file for $SCRIPT_NAME is NOT found."
22902290
return 1
22912291
fi
22922292
local webPageFile
@@ -9411,7 +9411,7 @@ _DoInstallation_()
94119411
_DoUnInstallation_()
94129412
{
94139413
"$isInteractive" && \
9414-
printf "\n${BOLDct}Are you sure you want to uninstall $ScriptFileName script now${NOct}"
9414+
printf "\n${BOLDct}Are you sure you want to uninstall $ScriptFileName now${NOct}"
94159415
! _WaitForYESorNO_ && return 0
94169416

94179417
if ! _AcquireLock_ cliFileLock ; then return 1 ; fi
@@ -10838,7 +10838,7 @@ _MainMenu_()
1083810838
}
1083910839

1084010840
##----------------------------------------##
10841-
## Modified by Martinski W. [2025-Apr-11] ##
10841+
## Modified by Martinski W. [2025-Apr-12] ##
1084210842
##----------------------------------------##
1084310843
_DoInitializationStartup_()
1084410844
{
@@ -10848,6 +10848,16 @@ _DoInitializationStartup_()
1084810848
if ! _CheckForMinimumRequirements_ && [ "$theParam" != "uninstall" ]
1084910849
then
1085010850
printf "\n${CRITct}Minimum requirements for $SCRIPT_NAME were not met. See the reason(s) above.${NOct}\n"
10851+
10852+
"$isInteractive" && \
10853+
printf "\n${BOLDct}Would you like to uninstall $ScriptFileName now${NOct}"
10854+
if _WaitForYESorNO_
10855+
then
10856+
_DoUnInstallation_
10857+
_DoExit_ 0
10858+
fi
10859+
printf "\n${BOLDct}To manually uninstall $ScriptFileName use the following command:${NOct}"
10860+
printf "\n\n ${BOLDct}$ScriptFilePath uninstall${NOct}\n\n"
1085110861
_DoExit_ 1
1085210862
fi
1085310863

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
22
## v1.4.2
3-
## 2025-Apr-11
3+
## 2025-Apr-12
44

55
## WebUI:
66
![image](https://github.com/user-attachments/assets/92701007-a902-4724-9bae-b255856a686a)

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
1.4.2
2-
25041102
2+
25041202

0 commit comments

Comments
 (0)