From 9e109cfe993b91f2aaa18703c044346be842627d Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Mon, 5 Jan 2026 23:07:10 -0800 Subject: [PATCH] Improvements and Fine-Tuning. More improvements and fine-tuning. --- README.md | 2 +- scribe.sh | 8 +++++--- syslog-ng.share/syslog-ng.conf-scribe | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4b79d32..e6214ae 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **scribe** is a **syslog-ng** and **logrotate** installer for ASUS routers running **Asuswrt-Merlin** ## v3.2.7 -### Updated on 2026-Jan-04 +### Updated on 2026-Jan-05 ## Getting Started diff --git a/scribe.sh b/scribe.sh index 2a95d0f..d619e07 100644 --- a/scribe.sh +++ b/scribe.sh @@ -18,7 +18,7 @@ # curl --retry 3 "https://raw.githubusercontent.com/AMTM-OSR/scribe/master/scribe.h" -o "/jffs/scripts/scribe" && chmod 0755 /jffs/scripts/scribe && /jffs/scripts/scribe install # ################################################################## -# Last Modified: 2026-Jan-04 +# Last Modified: 2026-Jan-05 #----------------------------------------------------------------- ################ Shellcheck directives ################ @@ -35,7 +35,7 @@ readonly script_name="scribe" readonly scribe_ver="v3.2.7" -readonly scriptVer_TAG="26010422" +readonly scriptVer_TAG="26010522" scribe_branch="develop" script_branch="$scribe_branch" @@ -1021,7 +1021,9 @@ sync_conf() sed -i "s/$old_doc.*/$new_doc/" "$sng_conf" stats_freq="$( grep -m1 'stats_freq(' "$sng_conf" | cut -d ';' -f 1 | grep -oE '[0-9]*' )" [ -n "$stats_freq" ] && sed -i "s/stats_freq($stats_freq)/stats(freq($stats_freq))/g" "$sng_conf" - if [ -n "$sng_version_str" ] && [ -n "$sng_conf_verstr" ] + if [ -n "$sng_version_str" ] && \ + [ -n "$sng_conf_verstr" ] && \ + [ "$sng_version_str" != "$sng_conf_verstr" ] then sed -i "s/^${sng_conf_vtag2}${sng_conf_verstr}.*/$sng_conf_vtag1 $sng_version_str/" "$sng_conf" fi diff --git a/syslog-ng.share/syslog-ng.conf-scribe b/syslog-ng.share/syslog-ng.conf-scribe index 4a5d09d..ef2fc10 100644 --- a/syslog-ng.share/syslog-ng.conf-scribe +++ b/syslog-ng.share/syslog-ng.conf-scribe @@ -1,12 +1,12 @@ ############################################################################# -# syslog-ng.conf customized for scribe on Asuswrt-Merlin firmware -# compare to /opt/share/syslog-ng/examples/syslog-ng.conf-opkg for differences from Entware distribution +# syslog-ng.conf customized for Scribe on Asuswrt-Merlin firmware +# Compare to /opt/share/syslog-ng/examples/syslog-ng.conf-opkg for differences from the Entware distribution # # syslog-ng documentation: https://www.syslog-ng.com/technical-documents/list/syslog-ng-open-source-edition # # Release notes: https://github.com/syslog-ng/syslog-ng/releases -@version: 4.1 +@version: 4.7 #@include "scl.conf" # uncomment this line to for additional functionality, see syslog-ng documentation @include "/opt/etc/syslog-ng.d/" # Put any customization files in this directory