diff --git a/MerlinAU.sh b/MerlinAU.sh index 05c96eeb..a01f7029 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,12 +4,13 @@ # # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop. # Official Co-Author: @Martinski W. - Date: 2023-Nov-01 -# Last Modified: 2025-Aug-05 +# Last Modified: 2025-Aug-10 ################################################################### set -u ## Set version for each Production Release ## -readonly SCRIPT_VERSION=1.5.2 +readonly SCRIPT_VERSION=1.5.3 +readonly SCRIPT_VERSTAG="25081021" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## SCRIPT_BRANCH="dev" @@ -77,6 +78,12 @@ readonly ScriptFileName="${0##*/}" readonly ScriptFNameTag="${ScriptFileName%%.*}" readonly ScriptDirNameD="${ScriptFNameTag}.d" +if [ "$SCRIPT_BRANCH" = "dev" ] +then readonly branchx_TAG="Branch: development" +else readonly branchx_TAG="Branch: $SCRIPT_BRANCH" +fi +readonly version_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}" + ##----------------------------------------## ## Modified by Martinski W. [2025-Jan-15] ## ##----------------------------------------## @@ -536,8 +543,9 @@ _ShowAbout_() clear _ShowLogo_ + + printf "About ${MGNTct}${SCRIPT_VERS_INFO}${NOct}\n" cat <&1 + sleep 2 + fi fi #------------------------------------------------------ @@ -10116,8 +10138,8 @@ _ConfirmCronJobForFWAutoUpdates_() fi ##------------------------------------------------------------## - # If 'runfwUpdateCheck' is true and built-in script is found - # run the built-in F/W Update check in the background. + # If 'runfwUpdateCheck' is true and the built-in script is + # present then execute the built-in F/W Update check now. ##------------------------------------------------------------## if "$runfwUpdateCheck" && [ -x "$FW_UpdateCheckScript" ] then @@ -11138,6 +11160,11 @@ _Gnuton_Check_Webs_Update_Script_() fi } +if [ "$SCRIPT_BRANCH" = "master" ] +then SCRIPT_VERS_INFO="[$branchx_TAG]" +else SCRIPT_VERS_INFO="[$version_TAG, $branchx_TAG]" +fi + ## Set variable to 'false' to stop the check ## checkWebsUpdateScriptForGnuton="$isGNUtonFW" _Gnuton_Check_Webs_Update_Script_ diff --git a/README.md b/README.md index de50bb59..7402d3d9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.5.2 -## 2025-Aug-05 +## v1.5.3 +## 2025-Aug-10 ## WebUI: ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e) diff --git a/version.txt b/version.txt index 4cda8f19..8af85beb 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.5.2 +1.5.3