From 59430ac07698ec831e95a0b70279ab01187431ea Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 10 May 2025 12:36:14 -0400 Subject: [PATCH 01/14] Include Update Button for Script in WebUI Include Update Button for Script in WebUI --- MerlinAU.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index a3d27e51..fb879902 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -9,7 +9,7 @@ set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.4 +readonly SCRIPT_VERSION=1.4.3 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -11061,6 +11061,17 @@ then _ReleaseLock_ cliFileLock fi ;; + "${SCRIPT_NAME}script_update" | \ + "${SCRIPT_NAME}forceupdate") + if _AcquireLock_ cliFileLock + then + if [ "$3" = "${SCRIPT_NAME}forceupdate" ] + then _SCRIPT_UPDATE_ force + else _CheckForNewScriptUpdates_ + fi + _ReleaseLock_ cliFileLock + fi + ;; "${SCRIPT_NAME}config" | \ "${SCRIPT_NAME}config_runLoginTest") if _AcquireLock_ cliFileLock From 0e6ce4b0eb8453cba025c0a6c8c545e5eb8c3ac4 Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 10 May 2025 12:37:33 -0400 Subject: [PATCH 02/14] Update MerlinAU.sh --- MerlinAU.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/MerlinAU.sh b/MerlinAU.sh index fb879902..b5a97f61 100644 --- a/MerlinAU.sh +++ b/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: 2025-May-05 +# Last Modified: 2025-May-10 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.4.3 +readonly SCRIPT_VERSION=1.4.5 readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -10950,9 +10950,9 @@ then _DoExit_ 0 fi -##----------------------------------------## -## Modified by Martinski W. [2025-Feb-15] ## -##----------------------------------------## +##------------------------------------------## +## Modified by ExtremeFiretop [2025-May-10] ## +##------------------------------------------## if [ $# -gt 0 ] then if ! _AcquireLock_ cliOptsLock From e69bab9e2e18b40ea20d5fcbb6de2549adbea4ab Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 10 May 2025 12:38:04 -0400 Subject: [PATCH 03/14] Update MerlinAU.asp --- MerlinAU.asp | 51 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/MerlinAU.asp b/MerlinAU.asp index 8c2b38d2..f748a9d2 100644 --- a/MerlinAU.asp +++ b/MerlinAU.asp @@ -2260,6 +2260,29 @@ function Uninstall() document.form.submit(); } +function UpdateMerlinAUScript () +{ + console.log("Initiating MerlinAU script update…"); + + let forceUpdateBox = document.getElementById('ForceScriptUpdateCheck'); + let actionScriptName = forceUpdateBox.checked + ? 'start_MerlinAUforceupdate' + : 'start_MerlinAUscript_update'; + + let ok = confirm( + forceUpdateBox.checked + ? "FORCED UPDATE: install immediately—even if current.\n\nContinue?" + : "Install only if a newer version exists.\n\nContinue?"); + if (!ok) return false; // <-- blocks submission + + document.form.action_script.value = actionScriptName; + document.form.action_wait.value = 10; + showLoading(); + document.form.submit(); + + return false; // prevent the button’s own default submit (avoids double‑post) +} + /**----------------------------------------**/ /** Modified by Martinski W. [2025-Jan-22] **/ /**----------------------------------------**/ @@ -2618,9 +2641,10 @@ function initializeCollapsibleSections()
- - - + + + + +
@@ -2638,9 +2662,28 @@ function initializeCollapsibleSections()
+ style="padding:0; vertical-align:middle; position:relative; margin-left:-5px; margin-top:5px; margin-bottom:8px"/>Approve changelog
+ +
+ +
+
From f89fcb340e3df40513bd91a53f26f0b9c68e209b Mon Sep 17 00:00:00 2001 From: Joel Samson Date: Sat, 10 May 2025 13:25:30 -0400 Subject: [PATCH 04/14] Update MerlinAU.asp --- MerlinAU.asp | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/MerlinAU.asp b/MerlinAU.asp index f748a9d2..5a425d07 100644 --- a/MerlinAU.asp +++ b/MerlinAU.asp @@ -29,8 +29,7 @@