From 68fecab5b7fdb418c242df42495f6f051db7cdc3 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 1 Mar 2025 15:19:37 -0500 Subject: [PATCH 1/2] Fix The Update Check Status Post Upgrade Fix The Update Check Status Post Upgrade in the WebUI --- MerlinAU.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MerlinAU.sh b/MerlinAU.sh index c1f5658a..8621d084 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -14,6 +14,10 @@ readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" +##FOR TESTING/DEBUG ONLY## +if true ; then SCRIPT_BRANCH="WebFun" ; fi +##FOR TESTING/DEBUG ONLY## + ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## ##----------------------------------------## @@ -8901,6 +8905,7 @@ _DoStartupInit_() _AutoStartupHook_ create 2>/dev/null _AutoServiceEvent_ create 2>/dev/null fi + } ##----------------------------------------## @@ -8933,6 +8938,7 @@ _DoInstallation_() if ! _AcquireLock_ cliMenuLock then Say "Exiting..." ; exit 1 ; fi + _ConfirmCronJobForFWAutoUpdates_ _MainMenu_ } From 2b6b4f86840085c8d189494452edea2036e65401 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 1 Mar 2025 15:22:20 -0500 Subject: [PATCH 2/2] Update MerlinAU.sh --- MerlinAU.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index 8621d084..3c6b9ea1 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -14,10 +14,6 @@ readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" -##FOR TESTING/DEBUG ONLY## -if true ; then SCRIPT_BRANCH="WebFun" ; fi -##FOR TESTING/DEBUG ONLY## - ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## ##----------------------------------------## @@ -8905,7 +8901,6 @@ _DoStartupInit_() _AutoStartupHook_ create 2>/dev/null _AutoServiceEvent_ create 2>/dev/null fi - } ##----------------------------------------##