diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 3000045d..cc045d95 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -15,7 +15,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout source code - uses: actions/checkout@v6.0.3 + uses: actions/checkout@v7.0.0 with: fetch-depth: 0 ref: 'main' # Ensure we're tagging the main branch after the merge @@ -85,7 +85,7 @@ jobs: git push origin ${{ steps.nextver.outputs.tag }} - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v3.0.0 + uses: softprops/action-gh-release@v3.0.1 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} diff --git a/MerlinAU.sh b/MerlinAU.sh index 9bc9d03b..ad9aec4d 100644 --- a/MerlinAU.sh +++ b/MerlinAU.sh @@ -4,16 +4,16 @@ # # 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.4 -readonly SCRIPT_VERSTAG="26061118" +readonly SCRIPT_VERSION=1.6.5 +readonly SCRIPT_VERSTAG="26062300" readonly SCRIPT_NAME="MerlinAU" ## Set to "master" for Production Releases ## -SCRIPT_BRANCH="master" +SCRIPT_BRANCH="dev" ##----------------------------------------## ## Modified by Martinski W. [2024-Jul-03] ## @@ -2245,13 +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_() { - [ ! -d "$FW_LOG_DIR" ] && return 1 - 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) # @@ -2271,6 +2271,7 @@ _CleanUpOldLogFiles_() # Delete logs older than 30 days # /usr/bin/find -L "$FW_LOG_DIR" -name '*.log' -mtime +30 -exec rm {} \; + retCode="$?" # Restore the most recent log file # if [ -n "$topLogFile" ] && \ @@ -2282,7 +2283,7 @@ _CleanUpOldLogFiles_() return 1 fi fi - return 0 + return "$retCode" } ##----------------------------------------## diff --git a/README.md b/README.md index 26f58ecd..607551e8 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # MerlinAU - AsusWRT-Merlin Firmware Auto Updater -## v1.6.4 -## 2026-June-21 +## v1.6.5 +## 2026-June-23 ## WebUI: image diff --git a/version.txt b/version.txt index 9edc58bb..9f05f9f2 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.6.4 +1.6.5