Skip to content

Improvements and Clean Up #583

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
Jun 24, 2026
+13 −27
Merged

Improvements and Clean Up #583

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
34 changes: 10 additions & 24 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
# Official Co-Author: @Martinski W. - Date: 2023-Nov-01
# Last Modified: 2026-Jun-11
# Last Modified: 2026-Jun-23
###################################################################
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.5
readonly SCRIPT_VERSTAG="26062210"
readonly SCRIPT_VERSTAG="26062300"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="dev"
Expand Down Expand Up @@ -2245,17 +2245,13 @@ readonly POST_REBOOT_SCRIPT_HOOK="[ -x $ScriptFilePath ] && $POST_REBOOT_SCRIPT_
readonly POST_UPDATE_EMAIL_SCRIPT_JOB="$ScriptFilePath postUpdateEmail &"
readonly POST_UPDATE_EMAIL_SCRIPT_HOOK="[ -x $ScriptFilePath ] && $POST_UPDATE_EMAIL_SCRIPT_JOB $hookScriptTagStr"

##------------------------------------------##
## Modified by ExtremeFiretop [2026-Jun-10] ##
##------------------------------------------##
##----------------------------------------##
## Modified by Martinski W. [2026-Jun-23] ##
##----------------------------------------##
_CleanUpOldLogFiles_()
{
# Create the log directory on a fresh installation.
if [ ! -d "$FW_LOG_DIR" ]
then
mkdir -p -m 755 "$FW_LOG_DIR" 2>/dev/null || return 1
fi
local numLogFiles topLogFile savedTopLogFile=""
[ ! -d "$FW_LOG_DIR" ] && return 0
local retCode numLogFiles topLogFile savedTopLogFile=""

numLogFiles="$(ls -1lt "$FW_LOG_DIR"/*.log 2>/dev/null | wc -l)"
# Leave one log file (if any available) #
Expand All @@ -2274,18 +2270,8 @@ _CleanUpOldLogFiles_()
fi

# Delete logs older than 30 days #
if ! /usr/bin/find -L "$FW_LOG_DIR" \
-name '*.log' \
-mtime +30 \
-exec rm -f {} \;
then
# Attempt restoration before returning failure.
[ -n "$savedTopLogFile" ] &&
[ -e "$savedTopLogFile" ] &&
mv -f "$savedTopLogFile" "$topLogFile" 2>/dev/null

return 1
fi
/usr/bin/find -L "$FW_LOG_DIR" -name '*.log' -mtime +30 -exec rm {} \;
retCode="$?"

# Restore the most recent log file #
if [ -n "$topLogFile" ] && \
Expand All @@ -2297,7 +2283,7 @@ _CleanUpOldLogFiles_()
return 1
fi
fi
return 0
return "$retCode"
}

##----------------------------------------##
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MerlinAU - AsusWRT-Merlin Firmware Auto Updater

## v1.6.4
## 2026-June-21
## v1.6.5
## 2026-June-23

## WebUI:
<img width="775" height="1640" alt="image" src="https://github.com/user-attachments/assets/846f889b-b39f-4ffe-a37a-8892ad9b2f7f" />
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 +1 @@
1.6.4
1.6.5