Skip to content

Wording Changes #543

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExtremeFiretop merged 1 commit into from
Jan 24, 2026
Merged

Wording Changes #543

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 11 additions & 13 deletions MerlinAU.asp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<script language="JavaScript" type="text/javascript">

/**----------------------------**/
/** Last Modified: 2025-Oct-27 **/
/** Last Modified: 2026-Jan-24 **/
/**----------------------------**/

// Separate variables for shared and AJAX settings //
Expand Down Expand Up @@ -69,7 +69,7 @@ var scriptAutoUpdateCronSchedHR = 'TBD';
var fwAutoUpdateCheckCronSchedHR = 'TBD';
var isScriptUpdateAvailable = 'TBD';
var fwUpdateEstimatedRunDate = 'TBD';
var MinimumScriptFWRequired = 'TBD';
var minimumScriptFWRequired = 'TBD';

let pendingScriptUpdateGateCheck = false;
let scriptUpdateGateTries = 0;
Expand Down Expand Up @@ -261,7 +261,7 @@ function ExtractFWVersion(verStr)
return match ? match[0] : String(verStr).trim();
}

// Prefer hidden #firmver (same nvram source, no formatting risk), else fallback to #fwVersionInstalled
// Prefer hidden #firmver (same nvram source, no formatting risk), else fallback to #fwVersionInstalled //
function GetInstalledFWVersionFromUI()
{
let firmverInput = document.getElementById('firmver');
Expand All @@ -288,10 +288,10 @@ function RunScriptUpdateFirmwareGateCheck()

success: function()
{
let requiredStr = ExtractFWVersion(MinimumScriptFWRequired);
let requiredStr = ExtractFWVersion(minimumScriptFWRequired);
let installedStr = GetInstalledFWVersionFromUI();

// If required version isn't ready yet, retry a few times
// If required version isn't ready yet, retry a few times //
if (!requiredStr || requiredStr === 'TBD')
{
if (scriptUpdateGateTries < scriptUpdateGateMaxTries)
Expand All @@ -313,11 +313,11 @@ function RunScriptUpdateFirmwareGateCheck()
{
alert(
"**SCRIPT UPDATE BLOCKED**\n\n" +
"MerlinAU cannot update because your installed firmware is " +
"below the minimum required firmware for this script update.\n\n" +
"Installed firmware: " + installedStr + "\n" +
"Minimum required: " + requiredStr + "\n\n" +
"Please update your router firmware, then try again."
"MerlinAU script cannot be updated because your router firmware is " +
"below the minimum firmware version supported by the new script update.\n\n" +
"Installed firmware version: " + installedStr + "\n" +
"Minimum version supported: " + requiredStr + "\n\n" +
"Please update the router firmware first, then try again to update the script."
);
}
},
Expand Down Expand Up @@ -2223,14 +2223,12 @@ function initial()
hiddenFrame.onload = function()
{
console.log("Hidden frame loaded with server response.");

if (pendingScriptUpdateGateCheck)
{
// Wait a moment to allow the backend logic to finish writing checkHelper.js
// Wait a moment to allow the backend logic to finish writing checkHelper.js //
setTimeout(RunScriptUpdateFirmwareGateCheck, 1000);
}
};

initializeCollapsibleSections();
}
}
Expand Down
95 changes: 48 additions & 47 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2026-Jan-02
# Last Modified: 2026-Jan-24
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.5.9
readonly SCRIPT_VERSTAG="26012310"
readonly SCRIPT_VERSTAG="26012404"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -198,12 +198,13 @@ readonly fwInstalledInnerVers="$(nvram get innerver)"
readonly fwInstalledBranchVer="${fwInstalledBaseVers}.$(echo "$fwInstalledBuildVers" | awk -F'.' '{print $1}')"

##------------------------------------------##
## Modified by ExtremeFiretop [2025-Jan-23] ##
## Modified by ExtremeFiretop [2026-Jan-23] ##
##------------------------------------------##
# For minimum supported firmware version check #
# TO NOTE: Due to Gnuton being behind RMerlin #
# Only lock out firmware versions that are 5 #
# builds behind the current production #
# For minimum supported firmware version check.
# *NOTE*: Due to Gnuton F/W being behind RMerlin
# F/W releases, remove support for F/W versions
# that are 5 builds behind the latest production.
#------------------------------------------------#
MinFirmwareVerCheckFailed=false
NewMinSupportedFirmwareVers="TBD"
readonly MinSupportedFW_3004_386_Ver="3004.386.13.2"
Expand Down Expand Up @@ -2810,13 +2811,13 @@ _DownloadScriptFiles_()
}

##---------------------------------------##
## Added by ExtremeFiretop [2025-Jan-23] ##
## Added by ExtremeFiretop [2026-Jan-23] ##
##---------------------------------------##
_GetRemoteMinSupportedFirmwareVers_()
{
# Echoes the minimum supported FW version (string) for the
# currently-installed FW branch (e.g. 3004.388), based on the
# *REMOTE* script content. Returns 0 on success.
# Returns the minimum supported F/W version string for the #
# currently-installed F/W branch (e.g. 3004.388), based on #
# the *REMOTE* script content. Returns code 0 on success. #
local tmpScript srceScriptUrl current_version branchVer branchKey
local varName minVers defaultVar

Expand Down Expand Up @@ -2860,24 +2861,25 @@ _GetRemoteMinSupportedFirmwareVers_()
}

##---------------------------------------##
## Added by ExtremeFiretop [2025-Jan-23] ##
## Added by ExtremeFiretop [2026-Jan-23] ##
##---------------------------------------##
_CheckNewScriptMinFWBeforeUpdate_()
{
# Returns 0 if OK (or unknown), 1 if the NEW script requires newer FW.
# Sets global NewMinSupportedFirmwareVers when known.
# Returns 0 if OK (or unknown), 1 if the NEW script requires newer FW. #
# Sets global NewMinSupportedFirmwareVers when known. #
local current_version numOfFields numCurrentVers numNewMinVers
local newMinVers

# If already known, reuse it (do not re-download / re-parse remote script)
if [ -n "$NewMinSupportedFirmwareVers" ] && [ "$NewMinSupportedFirmwareVers" != "TBD" ]
# If already known, reuse it (do not re-download / re-parse remote script) #
if [ -n "$NewMinSupportedFirmwareVers" ] && \
[ "$NewMinSupportedFirmwareVers" != "TBD" ]
then
newMinVers="$NewMinSupportedFirmwareVers"
else
newMinVers="$(_GetRemoteMinSupportedFirmwareVers_)" || return 0
[ -n "$newMinVers" ] || return 0

# Cache for future calls
# Cache for future calls #
NewMinSupportedFirmwareVers="$newMinVers"
fi

Expand All @@ -2892,10 +2894,12 @@ _CheckNewScriptMinFWBeforeUpdate_()
}

##-------------------------------------------##
## Modified by ExtremeFiretop [2025-Jan-23] ##
## Modified by ExtremeFiretop [2026-Jan-23] ##
##-------------------------------------------##
_SCRIPT_UPDATE_()
{
local current_version

ScriptUpdateDeclined=false
if [ $# -gt 0 ] && [ "$1" = "force" ]
then
Expand All @@ -2906,25 +2910,23 @@ _SCRIPT_UPDATE_()
current_version="$(_GetCurrentFWInstalledLongVersion_)"
if ! _CheckNewScriptMinFWBeforeUpdate_
then
_WriteVarDefToHelperJSFile_ "MinimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
_WriteVarDefToHelperJSFile_ "minimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
printf "\n${CRITct}*WARNING*:${NOct} MerlinAU v${DLRepoVersion} "
printf "requires newer router firmware.\n"
printf "\nCurrent F/W version found: ${REDct}%s${NOct}" \
"$current_version"
printf "\nMinimum version required: ${GRNct}%s${NOct}\n" \
"$NewMinSupportedFirmwareVers"
printf "\n${BOLDct}Recommendation:${NOct} Update router firmware first.\n"
printf "requires a newer router firmware version.\n"
printf "\nCurrent F/W version found: ${REDct}%s${NOct}" "$current_version"
printf "\nMinimum version supported: ${GRNct}%s${NOct}\n" "$NewMinSupportedFirmwareVers"
printf "\n${BOLDct}RECOMMENDATION:${NOct}\nUpdate the router firmware first before updating the MerlinAU script.\n"
if "$isInteractive"
then
printf "\n${BOLDct}Continue downloading anyway?${NOct}"
printf "\n${BOLDct}Continue to download and update the script anyway?${NOct}"
if ! _WaitForYESorNO_
then
ScriptUpdateDeclined=true
printf "\n${GRNct}Update cancelled.${NOct}\n"
return 1
fi
else
# Non-interactive (auto-update): do NOT brick the script.
# Non-interactive (auto-update): do NOT brick the script #
_SendEMailNotification_ FAILED_SCRIPT_UPDATE_MIN_FW_STATUS
return 1
fi
Expand Down Expand Up @@ -2971,19 +2973,18 @@ _SCRIPT_UPDATE_()
printf "${CYANct}Update Version Available Now: ${YLWct}${DLRepoVersion}${NOct}\n\n"

if "$mountWebGUI_OK"
then _SetVersionSharedSettings_ server "$DLRepoVersion" ; fi
then _SetVersionSharedSettings_ server "$DLRepoVersion"
fi

current_version="$(_GetCurrentFWInstalledLongVersion_)"
if ! _CheckNewScriptMinFWBeforeUpdate_
then
_WriteVarDefToHelperJSFile_ "MinimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
printf "\n${CRITct}*WARNING*:${NOct} Updating to MerlinAU v${DLRepoVersion} "
printf "requires newer router firmware.\n"
printf "\nCurrent F/W version found: ${REDct}%s${NOct}" \
"$current_version"
printf "\nMinimum version required: ${GRNct}%s${NOct}\n" \
"$NewMinSupportedFirmwareVers"
printf "\n${BOLDct}Recommendation:${NOct} Update router firmware first.\n"
_WriteVarDefToHelperJSFile_ "minimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
printf "\n${CRITct}*WARNING*:${NOct} MerlinAU v${DLRepoVersion} "
printf "requires a newer router firmware version.\n"
printf "\nCurrent F/W version found: ${REDct}%s${NOct}" "$current_version"
printf "\nMinimum version supported: ${GRNct}%s${NOct}\n" "$NewMinSupportedFirmwareVers"
printf "\n${BOLDct}RECOMMENDATION:${NOct}\nUpdate the router firmware first before updating the MerlinAU script.\n\n"
fi

if [ "$SCRIPT_VERSION" = "$DLRepoVersion" ] && \
Expand Down Expand Up @@ -3097,9 +3098,9 @@ _CheckForNewScriptUpdates_()
then
if ! _CheckNewScriptMinFWBeforeUpdate_
then
_WriteVarDefToHelperJSFile_ "MinimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
_WriteVarDefToHelperJSFile_ "minimumScriptFWRequired" "$NewMinSupportedFirmwareVers"
else
_WriteVarDefToHelperJSFile_ "MinimumScriptFWRequired" "TBD"
_WriteVarDefToHelperJSFile_ "minimumScriptFWRequired" "TBD"
fi
scriptUpdateNotify="New script update available.
${REDct}v${SCRIPT_VERSION}${NOct} --> ${GRNct}v${DLRepoVersion}${NOct}"
Expand All @@ -3114,7 +3115,7 @@ ${REDct}v${SCRIPT_VERSION}${NOct} --> ${GRNct}v${DLRepoVersion}${NOct}"
fi
else
scriptUpdateNotify=0
_WriteVarDefToHelperJSFile_ "MinimumScriptFWRequired" "TBD"
_WriteVarDefToHelperJSFile_ "minimumScriptFWRequired" "TBD"
_WriteVarDefToHelperJSFile_ "isScriptUpdateAvailable" "TBD"
fi
return 0
Expand Down Expand Up @@ -3142,7 +3143,7 @@ _GetLatestFWUpdateVersionFromRouter_()
}

##------------------------------------------##
## Modified by ExtremeFiretop [2025-Jan-23] ##
## Modified by ExtremeFiretop [2026-Jan-23] ##
##------------------------------------------##
_CreateEMailContent_()
{
Expand Down Expand Up @@ -3243,8 +3244,8 @@ _CreateEMailContent_()
} > "$tempEMailBodyMsg"
;;
FAILED_SCRIPT_UPDATE_MIN_FW_STATUS)
# best-effort: use already-known minimum requirement if available,
# otherwise attempt to compute it again from remote script
# Use already-known minimum version requirement if available; #
# otherwise, attempt to compute it again from remote script #
minFwRequired="$NewMinSupportedFirmwareVers"
if [ -z "$minFwRequired" ]
then
Expand All @@ -3255,11 +3256,11 @@ _CreateEMailContent_()
emailBodyTitle="MerlinAU Script Update Blocked (Unsupported Firmware)"
{
echo "MerlinAU did NOT install the new Script Update version <b>${DLRepoVersion}</b> on your <b>${MODEL_ID}</b> router."
echo "Reason: Your router firmware is below the minimum supported firmware required by this MerlinAU update."
printf "\nCurrent router firmware version:\n<b>${fwInstalledVersion}</b>\n"
printf "\nMinimum firmware required for MerlinAU v${DLRepoVersion}:\n<b>${minFwRequired}</b>\n"
echo "Reason: Your router firmware is below the minimum firmware version supported by the new MerlinAU update."
printf "\nCurrent router firmware version installed:\n<b>${fwInstalledVersion}</b>\n"
printf "\nMinimum firmware version supported by MerlinAU v${DLRepoVersion}:\n<b>${minFwRequired}</b>\n"
printf "\nThe installed script version remains: <b>${SCRIPT_VERSION}</b>\n"
printf "\nRecommendation: Update your router firmware first, then retry the MerlinAU update.\n"
printf "\nRECOMMENDATION:\nUpdate the router firmware first, then try again to update the MerlinAU script.\n"
} > "$tempEMailBodyMsg"
;;
FAILED_SCRIPT_UPDATE_STATUS)
Expand Down Expand Up @@ -10018,7 +10019,7 @@ _CheckForMinimumRequirements_()
requirementsCheckOK=false
Say "\n${CRITct}*WARNING*:${NOct} The current firmware version is below the minimum supported by this script."
printf "\nCurrent F/W version found: ${REDct}${FW_InstalledVersion}${NOct}"
printf "\nMinimum version required: ${GRNct}${MinSupportedFirmwareVers}${NOct}\n"
printf "\nMinimum version supported: ${GRNct}${MinSupportedFirmwareVers}${NOct}\n"
fi

jffsScriptOK="$(nvram get jffs2_scripts)"
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.5.9
## 2026-Jan-23
## 2026-Jan-24

## WebUI:
![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)
Expand Down