Skip to content

Code Improvements for Script Downloads #381

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

Code Improvements for Script Downloads #381

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
102 changes: 62 additions & 40 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2024-Dec-31
# Last Modified: 2025-Jan-01
###################################################################
set -u

Expand Down Expand Up @@ -475,9 +475,9 @@ Toggle_LEDs_PID=""
FW_UpdateCheckState="TBD"
FW_UpdateCheckScript="/usr/sbin/webs_update.sh"

##--------------------------------------##
## Added by Martinski W. [22023-Nov-24] ##
##--------------------------------------##
##-------------------------------------##
## Added by Martinski W. [2023-Nov-24] ##
##-------------------------------------##
#---------------------------------------------------------#
# The USB-attached drives can have multiple partitions
# with different file systems (NTFS, ext3, ext4, etc.),
Expand Down Expand Up @@ -1521,29 +1521,48 @@ _CheckForNewGUIVersionUpdate_()
return "$retCode"
}

##-------------------------------------##
## Added by Martinski W. [2025-Jan-01] ##
##-------------------------------------##
_CurlFileDownload_()
{
if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ]
then return 1 ; fi
local retCode tempFilePathDL="${2}.DL.TMP"

curl -LSs --retry 4 --retry-delay 5 --retry-connrefused \
"$1" -o "$tempFilePathDL"
if [ $? -ne 0 ] && [ ! -s "$tempFilePathDL" ] || \
grep -iq "^404: Not Found" "$tempFilePathDL"
then rm -f "$tempFilePathDL" ; retCode=1
else mv -f "$tempFilePathDL" "$2" ; retCode=0
fi
return "$retCode"
}

##----------------------------------------##
## Modified by Martinski W. [2024-Dec-31] ##
## Modified by Martinski W. [2025-Jan-01] ##
##----------------------------------------##
_SCRIPTUPDATE_()
{
local urlScriptVers theScriptVers extraParam=""

_DownloadScriptFiles_()
{
local retCode ScriptFileDL="${ScriptFilePath}.DL"

curl -LSs --retry 4 --retry-delay 5 "${SCRIPT_URL_REPO}/version.txt" -o "$SCRIPTVERPATH"
curl -LSs --retry 4 --retry-delay 5 "${SCRIPT_URL_REPO}/${SCRIPT_NAME}.sh" -o "$ScriptFileDL"

if [ $? -eq 0 ] && [ -s "$ScriptFileDL" ]
local retCode
if _CurlFileDownload_ "${SCRIPT_URL_REPO}/version.txt" "$SCRIPTVERPATH"
then
mv -f "$ScriptFileDL" "$ScriptFilePath"
chmod 755 "$ScriptFilePath"
retCode=0
retCode=0 ; chmod 664 "$SCRIPTVERPATH"
else
rm -f "$ScriptFileDL"
printf "\n${REDct}Download failed.${NOct}\n"
retCode=1
Say "${REDct}**ERROR**${NOct}: Unable to download latest version file for $SCRIPT_NAME."
fi
if _CurlFileDownload_ "${SCRIPT_URL_REPO}/${SCRIPT_NAME}.sh" "$ScriptFilePath"
then
retCode=0 ; chmod 755 "$ScriptFilePath"
else
retCode=1
Say "${REDct}**ERROR**${NOct}: Unable to download latest script file for $SCRIPT_NAME."
fi
return "$retCode"
}
Expand All @@ -1558,8 +1577,9 @@ _SCRIPTUPDATE_()

if _DownloadScriptFiles_
then
printf "${CYANct}$SCRIPT_NAME successfully updated.${NOct}\n\n"
printf "${CYANct}$SCRIPT_NAME was successfully updated.${NOct}\n\n"
sleep 1
[ -s "$SCRIPTVERPATH" ] && urlScriptVers="$(cat "$SCRIPTVERPATH")"
if [ $# -gt 1 ] && [ "$2" = "newgui" ] && \
_CheckForNewGUIVersionUpdate_ "$theScriptVers" "$urlScriptVers"
then extraParam="forceupdate" ; fi
Expand All @@ -1584,7 +1604,7 @@ _SCRIPTUPDATE_()
echo -e "${CYANct}This will overwrite your currently installed version.${NOct}"
if _WaitForYESorNO_
then
printf "\n\n${CYANct}Downloading $SCRIPT_NAME ${CYANct}v${DLRepoVersion}${NOct}\n"
printf "\n\n${CYANct}Downloading $SCRIPT_NAME $DLRepoVersion version.${NOct}\n"

if _DownloadScriptFiles_
then
Expand All @@ -1603,12 +1623,13 @@ _SCRIPTUPDATE_()
echo -e "${CYANct}Bingo! New version available! Would you like to update now?${NOct}"
if _WaitForYESorNO_
then
printf "\n\n${CYANct}Downloading $SCRIPT_NAME ${CYANct}v${DLRepoVersion}${NOct}\n"
printf "\n\n${CYANct}Downloading $SCRIPT_NAME $DLRepoVersion version.${NOct}\n"

if _DownloadScriptFiles_
then
printf "\n$(date) - $SCRIPT_NAME - Successfully downloaded $SCRIPT_NAME v${DLRepoVersion}\n"
printf "${CYANct}Update successful! Restarting script...${NOct}\n"
sleep 1
_CheckForNewGUIVersionUpdate_ && extraParam="forceupdate"
_ReleaseLock_
exec "$ScriptFilePath" $extraParam
Expand All @@ -1626,27 +1647,28 @@ _SCRIPTUPDATE_()
}

##----------------------------------------##
## Modified by Martinski W. [2024-Dec-31] ##
## Modified by Martinski W. [2025-Jan-01] ##
##----------------------------------------##
_CheckForNewScriptUpdates_()
{
local extraParam=""

echo
DLRepoVersion="$SCRIPT_VERSION"
[ -s "$SCRIPTVERPATH" ] && DLRepoVersion="$(cat "$SCRIPTVERPATH")"
rm -f "$SCRIPTVERPATH"

# Download the latest version file from the source repository
curl -LSs --retry 4 --retry-delay 5 "${SCRIPT_URL_REPO}/version.txt" -o "$SCRIPTVERPATH"

if [ $? -ne 0 ] || [ ! -s "$SCRIPTVERPATH" ]
then scriptUpdateNotify=0 ; return 1 ; fi
if ! _CurlFileDownload_ "${SCRIPT_URL_REPO}/version.txt" "$SCRIPTVERPATH"
then
Say "${REDct}**ERROR**${NOct}: Unable to download latest version file for $SCRIPT_NAME."
scriptUpdateNotify=0
return 1
fi

# Read in its contents for the current version file
DLRepoVersion="$(cat "$SCRIPTVERPATH")"
if [ -z "$DLRepoVersion" ]
then
echo "Variable for downloaded version is empty."
Say "${REDct}**ERROR**${NOct}: Variable for downloaded version is empty."
scriptUpdateNotify=0
return 1
fi
Expand All @@ -1656,16 +1678,16 @@ _CheckForNewScriptUpdates_()

if [ "$DLRepoVersionNum" -gt "$ScriptVersionNum" ]
then
scriptUpdateNotify="New script update available.
scriptUpdateNotify="New script update available.
${REDct}v${SCRIPT_VERSION}${NOct} --> ${GRNct}v${DLRepoVersion}${NOct}"
Say "$myLAN_HostName - A new script version update (v$DLRepoVersion) is available to download."
if [ "$ScriptAutoUpdateSetting" = "ENABLED" ]
then
_CheckForNewGUIVersionUpdate_ && extraParam="newgui"
_SCRIPTUPDATE_ force $extraParam
fi
Say "$myLAN_HostName - A new script version update (v$DLRepoVersion) is available to download."
if [ "$ScriptAutoUpdateSetting" = "ENABLED" ]
then
_CheckForNewGUIVersionUpdate_ && extraParam="newgui"
_SCRIPTUPDATE_ force $extraParam
fi
else
scriptUpdateNotify=0
scriptUpdateNotify=0
fi
return 0
}
Expand Down Expand Up @@ -3124,7 +3146,7 @@ _GetNodeInfo_()
return 1
fi

# Perform login request
# Perform login request #
curl -s -k "${NodeURLstr}/login.cgi" \
--referer "${NodeURLstr}/Main_Login.asp" \
--user-agent 'Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0' \
Expand All @@ -3142,7 +3164,7 @@ _GetNodeInfo_()
return 1
fi

# Run the curl command to retrieve the HTML content
# Retrieve the HTML content #
htmlContent="$(curl -s -k "${NodeURLstr}/appGet.cgi?hook=nvram_get(productid)%3bnvram_get(asus_device_list)%3bnvram_get(cfg_device_list)%3bnvram_get(firmver)%3bnvram_get(buildno)%3bnvram_get(extendno)%3bnvram_get(webs_state_flag)%3bnvram_get(odmpid)%3bnvram_get(wps_modelnum)%3bnvram_get(model)%3bnvram_get(build_name)%3bnvram_get(lan_hostname)%3bnvram_get(webs_state_info)%3bnvram_get(label_mac)" \
-H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0' \
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8' \
Expand Down Expand Up @@ -3182,7 +3204,7 @@ _GetNodeInfo_()
# Combine extracted information into one string #
Node_combinedVer="${node_firmver}.${node_buildno}.$node_extendno"

# Perform logout request
# Perform logout request #
curl -s -k "${NodeURLstr}/Logout.asp" \
-H 'User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0' \
-H 'Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,*/*;q=0.8' \
Expand Down Expand Up @@ -7088,9 +7110,9 @@ Please manually update to version ${GRNct}${MinSupportedFirmwareVers}${NOct} or
fi
fi

# Extracting the F/W Update codebase number to use in the curl #
# Extracting the F/W Update codebase number #
fwUpdateBaseNum="$(echo "$release_version" | cut -d'.' -f1)"
# Inserting dots between each number
# Inserting dots between each number #
dottedVersion="$(echo "$fwUpdateBaseNum" | sed 's/./&./g' | sed 's/.$//')"

## Check for Login Credentials ##
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,6 +1,6 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater
## v1.3.9
## 2024-Dec-21
## 2025-Jan-02

![image](https://github.com/user-attachments/assets/185f9fe4-acdb-419a-8154-ab6fa6e0fd46)
![image](https://github.com/user-attachments/assets/8f22818d-2118-4c47-a54a-e54fb147fd6b)
Expand Down
Loading