diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 0b13a90..4bea872 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -19,7 +19,7 @@ jobs: steps: # 1--- Check out master so we tag the exact merge commit - name: Checkout source code - uses: actions/checkout@v6.0.1 + uses: actions/checkout@v6.0.2 with: fetch-depth: 0 ref: 'master' diff --git a/README.md b/README.md index e2f58de..5eb678f 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # uiScribe -## v1.4.11 -### Updated on 2026-Jan-11 +## v1.4.12 +### Updated on 2026-Feb-15 ## About uiScribe updates the System Log page to show log files created by Scribe (syslog-ng). Requires [**Scribe**](https://github.com/cynicastic/scribe) diff --git a/uiScribe.sh b/uiScribe.sh index fb1e227..322dba8 100644 --- a/uiScribe.sh +++ b/uiScribe.sh @@ -13,7 +13,7 @@ ## Forked from https://github.com/jackyaz/uiScribe ## ## ## ######################################################## -# Last Modified: 2026-Jan-11 +# Last Modified: 2026-Feb-15 #------------------------------------------------------- ########### Shellcheck directives ########## @@ -29,9 +29,9 @@ ### Start of script variables ### readonly SCRIPT_NAME="uiScribe" -readonly SCRIPT_VERSION="v1.4.11" -readonly SCRIPT_VERSTAG="26011120" -SCRIPT_BRANCH="master" +readonly SCRIPT_VERSION="v1.4.12" +readonly SCRIPT_VERSTAG="26021523" +SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/${SCRIPT_NAME}.d" readonly SCRIPT_PAGE_DIR="$(readlink -f /www/user)" @@ -424,7 +424,7 @@ Create_Dirs() } ##----------------------------------------## -## Modified by Martinski W. [2025-Dec-13] ## +## Modified by Martinski W. [2026-Feb-15] ## ##----------------------------------------## _Generate_ListOf_Filtered_LogFiles_() { @@ -438,13 +438,13 @@ _Generate_ListOf_Filtered_LogFiles_() then while read -r theLINE && [ -n "$theLINE" ] do - logFilePath="$(echo "$theLINE" | sed -e 's/^[ ]*file("//;s/".*$//')" + logFilePath="$(echo "$theLINE" | sed -e "s/.*[{[:blank:]]\?file([\"']//;s/[\"'].*$//")" if grep -qE "^${logFilePath}$" "$tmpFilterList" then continue #Avoid duplicates# fi echo "$logFilePath" >> "$tmpFilterList" done <