From 2f2f0e7d437ccb96d03dd58c0d0081c510e519ce Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Mon, 30 Dec 2024 09:25:58 -0500
Subject: [PATCH 1/2] Update MerlinAU.sh

Small Improvements
---
 MerlinAU.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index bd581074..a3c87065 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -1686,8 +1686,8 @@ _CreateEMailContent_()
         fwNewUpdateVersion="$(Get_Custom_Setting "FW_New_Update_Notification_Vers")"
    fi
 
-   #Remove any suffix starting with "-" or "_" to avoid version comparison failures#
-   fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/[-_].*$//')"
+   # Remove "_rog" or "_tuf" or -gHASHVALUES or -Gnuton* suffix to avoid version comparison failure, can't remove all for proper beta and alpha comparison #
+   fwInstalledVersion="$(echo "$fwInstalledVersion" | sed -E 's/(_(rog|tuf)|-g[0-9a-f]{10}|-gnuton[0-9]+)$//')"
 
    case "$1" in
        FW_UPDATE_TEST_EMAIL)
@@ -8722,7 +8722,7 @@ _ShowAdvancedOptionsMenu_()
        fi
        if "$sendEMailNotificationsFlag"
        then
-           printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}, Format: ${GRNct}${sendEMailFormaType}${NOct}]\n"
+           printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}\n"
        else
            printf "\n${padStr}[Currently ${REDct}DISABLED${NOct}]\n"
        fi

From 9c5f9c92af097fec6632d4fbd51f773b038196d6 Mon Sep 17 00:00:00 2001
From: Joel Samson <joel.samson@hotmail.com>
Date: Tue, 31 Dec 2024 00:50:58 -0500
Subject: [PATCH 2/2] Update MerlinAU.sh

---
 MerlinAU.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MerlinAU.sh b/MerlinAU.sh
index a3c87065..de90eb6e 100644
--- a/MerlinAU.sh
+++ b/MerlinAU.sh
@@ -8722,7 +8722,7 @@ _ShowAdvancedOptionsMenu_()
        fi
        if "$sendEMailNotificationsFlag"
        then
-           printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}\n"
+           printf "\n${padStr}[Currently ${GRNct}ENABLED${NOct}]\n"
        else
            printf "\n${padStr}[Currently ${REDct}DISABLED${NOct}]\n"
        fi