Skip to content

Fix log cleanup function to create directory and restore logs #581

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
Martinski4GitHub merged 3 commits into from
Jun 23, 2026
+20 −5
Merged

Fix log cleanup function to create directory and restore logs #581

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09a4e60
Fix log cleanup function to create directory and restore logs
ExtremeFiretop Jun 22, 2026
28bce87
Update script version and branch for development
ExtremeFiretop Jun 22, 2026
7a3be17
Update MerlinAU.sh
ExtremeFiretop Jun 22, 2026
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
25 changes: 20 additions & 5 deletions MerlinAU.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
set -u

## Set version for each Production Release ##
readonly SCRIPT_VERSION=1.6.4
readonly SCRIPT_VERSTAG="26061118"
readonly SCRIPT_VERSION=1.6.5
readonly SCRIPT_VERSTAG="26062210"
readonly SCRIPT_NAME="MerlinAU"
## Set to "master" for Production Releases ##
SCRIPT_BRANCH="master"
SCRIPT_BRANCH="dev"

##----------------------------------------##
## Modified by Martinski W. [2024-Jul-03] ##
Expand Down Expand Up @@ -2250,7 +2250,11 @@ readonly POST_UPDATE_EMAIL_SCRIPT_HOOK="[ -x $ScriptFilePath ] && $POST_UPDATE_E
##------------------------------------------##
_CleanUpOldLogFiles_()
{
[ ! -d "$FW_LOG_DIR" ] && return 1
# 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
Comment thread
ExtremeFiretop marked this conversation as resolved.
fi
local numLogFiles topLogFile savedTopLogFile=""

numLogFiles="$(ls -1lt "$FW_LOG_DIR"/*.log 2>/dev/null | wc -l)"
Expand All @@ -2270,7 +2274,18 @@ _CleanUpOldLogFiles_()
fi

# Delete logs older than 30 days #
/usr/bin/find -L "$FW_LOG_DIR" -name '*.log' -mtime +30 -exec rm {} \;
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

Comment thread
ExtremeFiretop marked this conversation as resolved.
return 1
fi

# Restore the most recent log file #
if [ -n "$topLogFile" ] && \
Expand Down