Skip to content

Code Improvements for Script Updates #380

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 1, 2025
Merged

Code Improvements for Script Updates #380

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
27 changes: 18 additions & 9 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,13 +1500,21 @@ fi
##-------------------------------------##
## Added by Martinski W. [2024-Dec-31] ##
##-------------------------------------##
# Temporary function used to migrate to future new script version #
newGUIversionNum="$(_ScriptVersionStrToNum_ '1.4.0')"
# Temporary code used to migrate to future new script version #
_CheckForNewGUIVersionUpdate_()
{
local newGUIversionNum retCode
newGUIversionNum="$(_ScriptVersionStrToNum_ '1.4.0')"
if [ "$ScriptVersionNum" -lt "$newGUIversionNum" ] && \
[ "$DLRepoVersionNum" -ge "$newGUIversionNum" ]
local retCode theScriptVerNum urlScriptVerNum
if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
then
theScriptVerNum="$ScriptVersionNum"
urlScriptVerNum="$DLRepoVersionNum"
else
theScriptVerNum="$(_ScriptVersionStrToNum_ "$1")"
urlScriptVerNum="$(_ScriptVersionStrToNum_ "$2")"
fi
if [ "$theScriptVerNum" -lt "$newGUIversionNum" ] && \
[ "$urlScriptVerNum" -ge "$newGUIversionNum" ]
then retCode=0
else retCode=1
fi
Expand All @@ -1518,7 +1526,7 @@ _CheckForNewGUIVersionUpdate_()
##----------------------------------------##
_SCRIPTUPDATE_()
{
local urlScriptVers preScriptVers extraParam=""
local urlScriptVers theScriptVers extraParam=""

_DownloadScriptFiles_()
{
Expand All @@ -1543,16 +1551,17 @@ _SCRIPTUPDATE_()
if [ $# -gt 0 ] && [ "$1" = "force" ]
then
printf "\n${CYANct}Force downloading latest script version...${NOct}\n"
preScriptVers="$SCRIPT_VERSION"
[ -s "$SCRIPTVERPATH" ] && preScriptVers="$(cat "$SCRIPTVERPATH")"
theScriptVers="$SCRIPT_VERSION"
[ -s "$SCRIPTVERPATH" ] && theScriptVers="$(cat "$SCRIPTVERPATH")"
urlScriptVers="$(/usr/sbin/curl -LSs --retry 4 --retry-delay 5 "${SCRIPT_URL_REPO}/version.txt")"
printf "${CYANct}Downloading latest version ($urlScriptVers) of ${SCRIPT_NAME}${NOct}\n"

if _DownloadScriptFiles_
then
printf "${CYANct}$SCRIPT_NAME successfully updated.${NOct}\n\n"
sleep 1
if [ $# -gt 1 ] && [ "$2" = "newgui" ] && [ "$urlScriptVers" != "$preScriptVers" ]
if [ $# -gt 1 ] && [ "$2" = "newgui" ] && \
_CheckForNewGUIVersionUpdate_ "$theScriptVers" "$urlScriptVers"
then extraParam="forceupdate" ; fi
_ReleaseLock_
exec "$ScriptFilePath" $extraParam
Expand Down
Loading