Skip to content

Commit

Permalink
Merge pull request #296 from ExtremeFiretop/ExtremeFiretop-Small1.3.0…
Browse files Browse the repository at this point in the history
…Patch

Match between Gnuton and Merlin for Changelog Behaviour
  • Loading branch information
ExtremeFiretop authored Sep 2, 2024
2 parents 3444433 + 1bf1664 commit c6f6661
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions MerlinAU.sh
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-Aug-18
# Last Modified: 2024-Sep-02
###################################################################
set -u

Expand Down Expand Up @@ -4729,6 +4729,9 @@ _ManageChangelogMerlin_()
return 0
}

##------------------------------------------##
## Modified by ExtremeFiretop [2024-Sep-02] ##
##------------------------------------------##
_ManageChangelogGnuton_()
{
if [ $# -eq 0 ] || [ -z "$1" ]
Expand All @@ -4755,7 +4758,10 @@ _ManageChangelogGnuton_()
FW_Changelog_GITHUB="${FW_BIN_DIR}/${FW_FileName}_Changelog.txt"

wgetLogFile="${FW_BIN_DIR}/${ScriptFNameTag}.WGET.LOG"
printf "\nRetrieving ${GRNct}${FW_Changelog_GITHUB}${NOct} ...\n"

if [ "$mode" = "view" ]; then
printf "\nRetrieving ${GRNct}${FW_Changelog_GITHUB}${NOct} ...\n"
fi

wget --timeout=5 --tries=4 --waitretry=5 --retry-connrefused \
-O "$FW_Changelog_GITHUB" -o "$wgetLogFile" "${Gnuton_changelogurl}"
Expand Down

0 comments on commit c6f6661

Please sign in to comment.