From 60216c965713551ed82daa87436c06218890c836 Mon Sep 17 00:00:00 2001 From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com> Date: Wed, 13 Aug 2025 19:24:43 -0700 Subject: [PATCH] Fixed Issue with Uninstallation on Gnuton F/W On Gnuton F/W, there was an issue that generated an error and was preventing a full uninstallation of MerlinAU. --- MerlinAU.sh | 8 +++++--- README.md | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index a01f7029..c1050432 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,13 +4,13 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Aug-10 +# Last Modified: 2025-Aug-13 ################################################################### set -u ## Set version for each Production Release ## readonly SCRIPT_VERSION=1.5.3 -readonly SCRIPT_VERSTAG="25081021" +readonly SCRIPT_VERSTAG="25081319" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -9630,7 +9630,7 @@ _DoInstallation_() } ##----------------------------------------## -## Modified by Martinski W. [2025-Apr-11] ## +## Modified by Martinski W. [2025-Aug-13] ## ##----------------------------------------## _DoUnInstallation_() { @@ -9667,6 +9667,8 @@ _DoUnInstallation_() _AutoServiceEvent_ delete 2>/dev/null fi + "$isGNUtonFW" && umount "$FW_UpdateCheckScript" 2>/dev/null + if rm -fr "${SETTINGS_DIR:?}" && \ rm -fr "${SCRIPT_WEB_DIR:?}" && \ rm -fr "${FW_BIN_BASE_DIR:?}/$ScriptDirNameD" && \ diff --git a/README.md b/README.md index 7402d3d9..742937db 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater ## v1.5.3 -## 2025-Aug-10 +## 2025-Aug-13 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)