From 5207a6a14e4bfb21588ba83ee9bb365a88c110f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Sep 2025 14:33:42 +0000 Subject: [PATCH 1/9] Bump softprops/action-gh-release in the all-actions group Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.3.2 to 2.3.3 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.2...v2.3.3) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.3.3 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 110e00c..2c1dfd0 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.3.2 + uses: softprops/action-gh-release@v2.3.3 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From 056b18c75c5834edb52f6a68dd31dbd2198abef2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 15:06:00 +0000 Subject: [PATCH 2/9] Bump softprops/action-gh-release in the all-actions group Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.3.3 to 2.3.4 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.3...v2.3.4) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.3.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index 2c1dfd0..bafba4b 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.3.3 + uses: softprops/action-gh-release@v2.3.4 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From f25d7e2fb7d02505a76dad0d58d6cc754fc310c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 15:21:50 +0000 Subject: [PATCH 3/9] Bump softprops/action-gh-release in the all-actions group Bumps the all-actions group with 1 update: [softprops/action-gh-release](https://github.com/softprops/action-gh-release). Updates `softprops/action-gh-release` from 2.3.4 to 2.4.1 - [Release notes](https://github.com/softprops/action-gh-release/releases) - [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md) - [Commits](https://github.com/softprops/action-gh-release/compare/v2.3.4...v2.4.1) --- updated-dependencies: - dependency-name: softprops/action-gh-release dependency-version: 2.4.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: all-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/Create-NewReleases.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Create-NewReleases.yml b/.github/workflows/Create-NewReleases.yml index bafba4b..0331864 100644 --- a/.github/workflows/Create-NewReleases.yml +++ b/.github/workflows/Create-NewReleases.yml @@ -97,7 +97,7 @@ jobs: # 7--- Publish a GitHub Release with auto-generated notes - name: Create Release with Automated Release Notes - uses: softprops/action-gh-release@v2.3.4 + uses: softprops/action-gh-release@v2.4.1 with: token: ${{ secrets.GITHUB_TOKEN }} tag_name: ${{ steps.nextver.outputs.tag }} From 6ee3fbb01f2e1496a064c2deabba5b28b7bab05e Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sat, 25 Oct 2025 21:29:56 -0700 Subject: [PATCH 4/9] Update .gitattributes Updated attributes. --- .gitattributes | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitattributes b/.gitattributes index fcadb2c..b8ba9ce 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,12 @@ * text eol=lf +*.sh text eol=lf +*.md text eol=lf +*.asp text eol=lf +*.js text eol=lf +*.css text eol=lf +*.gz binary +*.png binary +*.jpg binary +*.jpeg binary +*.zip binary +*.tar.gz binary From f9fa7384fd1aad12efdf2a3e7dfa20b20bf2c854 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sat, 25 Oct 2025 21:38:48 -0700 Subject: [PATCH 5/9] Code Improvements --- README.md | 4 ++-- uiScribe.sh | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index f8ffaac..63d2f07 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # uiScribe -## v1.4.8 -### Updated on 2025-Aug-23 +## v1.4.9 +### Updated on 2025-Oct-25 ## 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 023e822..83b3023 100644 --- a/uiScribe.sh +++ b/uiScribe.sh @@ -13,7 +13,7 @@ ## Forked from https://github.com/jackyaz/uiScribe ## ## ## ######################################################## -# Last Modified: 2025-Aug-23 +# Last Modified: 2025-Oct-25 #------------------------------------------------------- ########### Shellcheck directives ########## @@ -29,8 +29,8 @@ ### Start of script variables ### readonly SCRIPT_NAME="uiScribe" -readonly SCRIPT_VERSION="v1.4.8" -readonly SCRIPT_VERSTAG="25082322" +readonly SCRIPT_VERSION="v1.4.9" +readonly SCRIPT_VERSTAG="25102522" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME.d" @@ -791,10 +791,10 @@ _CenterTextStr_() ScriptHeader() { clear - local spaceLen=50 - printf "\n" + local spaceLen=50 colorCT + [ "$SCRIPT_BRANCH" = "master" ] && colorCT="$GRNct" || colorCT="$MGNTct" + echo printf "${BOLD}########################################################${CLRct}\n" - printf "${BOLD}## ##${CLRct}\n" printf "${BOLD}## _ _____ _ _ ##${CLRct}\n" printf "${BOLD}## (_) / ____| (_)| | ##${CLRct}\n" printf "${BOLD}## _ _ _ | (___ ___ _ __ _ | |__ ___ ##${CLRct}\n" @@ -803,7 +803,8 @@ ScriptHeader() printf "${BOLD}## \__,_||_||_____/ \___||_| |_||_.__/ \___| ##${CLRct}\n" printf "${BOLD}## ##${CLRct}\n" printf "${BOLD}## ${GRNct}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$versionMod_TAG" "$spaceLen")" - printf "${BOLD}## ${GRNct}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$branchxStr_TAG" "$spaceLen")" + printf "${BOLD}## ${colorCT}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$branchxStr_TAG" "$spaceLen")" + printf "${BOLD}## ##${CLRct}\n" printf "${BOLD}## https://github.com/AMTM-OSR/uiScribe ##${CLRct}\n" printf "${BOLD}## Forked from https://github.com/jackyaz/uiScribe ##${CLRct}\n" printf "${BOLD}## ##${CLRct}\n" @@ -1011,6 +1012,7 @@ Menu_Startup() Create_Symlinks Auto_Startup create 2>/dev/null Auto_ServiceEvent create 2>/dev/null + Set_Version_Custom_Settings local "$SCRIPT_VERSION" Shortcut_Script create Mount_WebUI Clear_Lock @@ -1168,6 +1170,7 @@ then Create_Symlinks Auto_Startup create 2>/dev/null Auto_ServiceEvent create 2>/dev/null + Set_Version_Custom_Settings local "$SCRIPT_VERSION" Shortcut_Script create _CheckFor_WebGUI_Page_ ScriptHeader From 15c6b6261ccb71b7b0cb95a2398a4edae4b81335 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Thu, 30 Oct 2025 01:03:15 -0700 Subject: [PATCH 6/9] Added "client_function.js" reference. --- Main_LogStatus_Content.asp | 18 ++++++++++++------ README.md | 2 +- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Main_LogStatus_Content.asp b/Main_LogStatus_Content.asp index 525dc52..656855a 100644 --- a/Main_LogStatus_Content.asp +++ b/Main_LogStatus_Content.asp @@ -20,14 +20,16 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo +