Skip to content

Check for Version File #447

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 2 commits into from
Apr 8, 2025
Merged

Check for Version File #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602d6a8
Check for Version File
Martinski4GitHub Apr 8, 2025
f8c271d
Merge branch 'ExtremeFiretop:dev' into dev
Martinski4GitHub Apr 8, 2025
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
17 changes: 16 additions & 1 deletion MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2243,6 +2243,19 @@ _CheckFor_WebGUI_Page_()
fi
}

##-------------------------------------##
## Added by Martinski W. [2025-Apr-07] ##
##-------------------------------------##
_CheckFor_VersionFile_()
{
if [ ! -s "$SCRIPT_VERPATH" ]
then
_ReleaseLock_
exec "$ScriptFilePath" install
exit 0
fi
}

##----------------------------------------##
## Modified by Martinski W. [2025-Jan-11] ##
##----------------------------------------##
Expand Down Expand Up @@ -10806,7 +10819,7 @@ FW_InstalledVerStr="${GRNct}${FW_InstalledVersion}${NOct}"
FW_NewUpdateVerInit=TBD

##----------------------------------------##
## Modified by Martinski W. [2025-Feb-12] ##
## Modified by Martinski W. [2025-Apr-07] ##
##----------------------------------------##
if [ $# -eq 0 ] || [ -z "$1" ] || \
{ [ $# -gt 1 ] && [ "$1" = "reload" ] ; }
Expand All @@ -10823,8 +10836,10 @@ then
fi
if [ "$ScriptAutoUpdateSetting" = "ENABLED" ]
then _AddScriptAutoUpdateCronJob_ ; fi

_ConfirmCronJobForFWAutoUpdates_
_CheckFor_WebGUI_Page_
_CheckFor_VersionFile_

_MainMenu_ "$@"
_DoExit_ 0
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
1.4.1
25040718
25040723