From 3019b6fe45d89d9cf6642ea8ec6fee2efb57efdb Mon Sep 17 00:00:00 2001
From: Martinski <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sun, 3 Aug 2025 23:47:48 -0700
Subject: [PATCH 01/11] Code Improvements

Code improvements and fine-tuning.
---
 README.md    |  4 ++--
 ntpmerlin.sh | 46 +++++++++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 105dcd1..076f21b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ntpMerlin
 
-## v3.4.10
-### Updated on 2025-Jul-31
+## v3.4.11
+### Updated on 2025-Aug-03
 ## About
 ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.
 
diff --git a/ntpmerlin.sh b/ntpmerlin.sh
index 10165ec..417aab4 100644
--- a/ntpmerlin.sh
+++ b/ntpmerlin.sh
@@ -14,7 +14,7 @@
 ##     Forked from https://github.com/jackyaz/ntpMerlin     ##
 ##                                                          ##
 ##############################################################
-# Last Modified: 2025-Jul-31
+# Last Modified: 2025-Aug-03
 #-------------------------------------------------------------
 
 ###############       Shellcheck directives      #############
@@ -36,8 +36,8 @@
 ### Start of script variables ###
 readonly SCRIPT_NAME="ntpMerlin"
 readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')"
-readonly SCRIPT_VERSION="v3.4.10"
-readonly SCRIPT_VERSTAG="25073122"
+readonly SCRIPT_VERSION="v3.4.11"
+readonly SCRIPT_VERSTAG="25080322"
 SCRIPT_BRANCH="develop"
 SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
 readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
@@ -370,9 +370,9 @@ Update_File()
 	if [ "$1" = "S77ntpd" ] || [ "$1" = "S77chronyd" ]
 	then
 		rm -f "$SCRIPT_DIR"/S77*d
-		srvcefile="$SCRIPT_DIR/$1"
-		Download_File "$SCRIPT_REPO/$1" "$srvcefile"
-		if ! diff -q "$srvcefile" "/opt/etc/init.d/$1" >/dev/null 2>&1
+		srvceFile="$SCRIPT_DIR/$1"
+		Download_File "$SCRIPT_REPO/$1" "$srvceFile"
+		if ! diff -q "$srvceFile" "/opt/etc/init.d/$1" >/dev/null 2>&1
 		then
 			Print_Output true "New version of $1 downloaded" "$PASS"
 			TimeServer_Customise
@@ -1163,26 +1163,30 @@ _CheckFor_WebGUI_Page_()
 }
 
 ##----------------------------------------##
-## Modified by Martinski W. [2025-Jul-30] ##
+## Modified by Martinski W. [2025-Aug-03] ##
 ##----------------------------------------##
 TimeServer_Customise()
 {
-	local TIMESERVER_ID="$(TimeServer check)"
+	local TIMESERVER_ID  initServicePath
+
+	TIMESERVER_ID="$(TimeServer check)"
+	initServicePath="/opt/etc/init.d/S77$TIMESERVER_ID"
 
 	if [ -f /opt/etc/init.d/S77ntpd ]
 	then
 		/opt/etc/init.d/S77ntpd stop >/dev/null 2>&1
 		sleep 2 ; killall -q ntpd ; sleep 1
+		rm -f /opt/etc/init.d/S77ntpd
 	fi
 	if [ -f /opt/etc/init.d/S77chronyd ]
 	then
 		/opt/etc/init.d/S77chronyd stop >/dev/null 2>&1
 		sleep 2 ; killall -q chronyd ; sleep 1
+		rm -f /opt/etc/init.d/S77chronyd
 	fi
-	rm -f /opt/etc/init.d/S77ntpd /opt/etc/init.d/S77chronyd
 
-	Download_File "$SCRIPT_REPO/S77$TIMESERVER_ID" "/opt/etc/init.d/S77$TIMESERVER_ID"
-	chmod a+x "/opt/etc/init.d/S77$TIMESERVER_ID"
+	Download_File "$SCRIPT_REPO/S77$TIMESERVER_ID" "$initServicePath"
+	chmod a+x "$initServicePath"
 
 	if [ "$TIMESERVER_ID" = "chronyd" ]
 	then
@@ -1195,7 +1199,7 @@ TimeServer_Customise()
 		[ ! -L /opt/etc/passwd ] && \
 		ln -snf /etc/passwd /opt/etc/passwd 2>/dev/null
 	fi
-	"/opt/etc/init.d/S77$TIMESERVER_ID" restart >/dev/null 2>&1
+	"$initServicePath" restart >/dev/null 2>&1
 }
 
 ##-------------------------------------##
@@ -1204,7 +1208,7 @@ TimeServer_Customise()
 TimeServer_ServiceCheck()
 {
     local runFullCheck=true  TIMESERVER_ID
-    local initTimeServerPath  ntpxTimeServerPath
+    local initTimeServerPath  saveTimeServerPath
 
     if [ $# -gt 0 ] && [ -n "$1" ] && \
        echo "$1" | grep -qE "^(true|false)$"
@@ -1213,22 +1217,22 @@ TimeServer_ServiceCheck()
     "$runFullCheck" && Entware_Ready
     TIMESERVER_ID="$(TimeServer check)"
     initTimeServerPath="/opt/etc/init.d/S77$TIMESERVER_ID"
-    ntpxTimeServerPath="$SCRIPT_DIR/S77$TIMESERVER_ID"
+    saveTimeServerPath="$SCRIPT_DIR/S77$TIMESERVER_ID"
 
-    if "$runFullCheck" || [ ! -s "$ntpxTimeServerPath" ]
+    if "$runFullCheck" || [ ! -s "$saveTimeServerPath" ]
     then
         Update_File "S77$TIMESERVER_ID" >/dev/null 2>&1
     else
         # Make sure we have the ntpMerlin version #
-        if [ -s "$ntpxTimeServerPath" ] && [ -s "$initTimeServerPath" ] && \
-           ! diff -q "$initTimeServerPath" "$ntpxTimeServerPath" >/dev/null 2>&1 
+        if [ -s "$saveTimeServerPath" ] && [ -s "$initTimeServerPath" ] && \
+           ! diff -q "$initTimeServerPath" "$saveTimeServerPath" >/dev/null 2>&1 
         then
             "$initTimeServerPath" stop >/dev/null 2>&1
-            sleep 2 ; killall "$TIMESERVER_ID"
-            cp -fp "$ntpxTimeServerPath" "$initTimeServerPath"
+            sleep 2 ; killall -q "$TIMESERVER_ID"
+            cp -fp "$saveTimeServerPath" "$initTimeServerPath"
             chmod a+x "$initTimeServerPath"
-            "$initTimeServerPath" restart
         fi
+        [ -z "$(pidof "$TIMESERVER_ID")" ] && "$initTimeServerPath" restart
 
         # Stop & remove extraneous service script #
         if [ "$TIMESERVER_ID" = "chronyd" ] && \
@@ -2111,7 +2115,7 @@ Get_TimeServer_Stats()
 
 	echo 'var ntpstatus = "InProgress";' > /tmp/detect_ntpmerlin.js
 
-	killall ntp 2>/dev/null
+	killall -q ntp 2>/dev/null
 
 	TIMESERVER="$(TimeServer check)"
 	if [ "$TIMESERVER" = "ntpd" ]

From 9165d731d71778309eec3929527382f2d6b429b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Aug 2025 18:26:55 +0000
Subject: [PATCH 02/11] Bump actions/checkout from 4.2.2 to 5.0.0 in the
 all-actions group

Bumps the all-actions group with 1 update: [actions/checkout](https://github.com/actions/checkout).


Updates `actions/checkout` from 4.2.2 to 5.0.0
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.2.2...v5.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .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 cd3ba75..65db905 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@v4.2.2
+        uses: actions/checkout@v5.0.0
         with:
           fetch-depth: 0
           ref: 'master'

From aa3e821e08614034f9498701aa8e90f6a0a6b19a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 08:35:21 +0000
Subject: [PATCH 03/11] 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] <support@github.com>
---
 .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 65db905..3c3580e 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 25638ab94a36a228a43a352fe05fc2c63f57171c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 08:48:38 +0000
Subject: [PATCH 04/11] 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] <support@github.com>
---
 .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 3c3580e..d78992e 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 7e1e05384a5dc6b0ebed490283e202dff34c751a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Oct 2025 08:42:39 +0000
Subject: [PATCH 05/11] 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] <support@github.com>
---
 .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 d78992e..2962058 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 691ef2a968c3545ffb9d573fd719d9922e298b9f Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 25 Oct 2025 06:47:18 -0700
Subject: [PATCH 06/11] Code Improvements

Some code improvements.
---
 .gitattributes | 8 ++++++++
 README.md      | 3 ++-
 ntpmerlin.sh   | 6 ++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index fcadb2c..5647e58 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
 * text eol=lf
+*.sh text eol=lf
+*.md text eol=lf
+*.asp text eol=lf
+*.gz binary
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.zip binary
diff --git a/README.md b/README.md
index 076f21b..d1f43a4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # ntpMerlin
 
 ## v3.4.11
-### Updated on 2025-Aug-03
+### Updated on 2025-Oct-25
+
 ## About
 ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.
 
diff --git a/ntpmerlin.sh b/ntpmerlin.sh
index 417aab4..7c3c7c9 100644
--- a/ntpmerlin.sh
+++ b/ntpmerlin.sh
@@ -14,7 +14,7 @@
 ##     Forked from https://github.com/jackyaz/ntpMerlin     ##
 ##                                                          ##
 ##############################################################
-# Last Modified: 2025-Aug-03
+# Last Modified: 2025-Oct-25
 #-------------------------------------------------------------
 
 ###############       Shellcheck directives      #############
@@ -37,7 +37,7 @@
 readonly SCRIPT_NAME="ntpMerlin"
 readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')"
 readonly SCRIPT_VERSION="v3.4.11"
-readonly SCRIPT_VERSTAG="25080322"
+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_LOWER.d"
@@ -2882,6 +2882,7 @@ Menu_Startup()
 	Create_Symlinks
 	Auto_Startup create 2>/dev/null
 	Auto_Cron create 2>/dev/null
+	Set_Version_Custom_Settings local "$SCRIPT_VERSION"
 	Auto_ServiceEvent create 2>/dev/null
 	NTP_Firmware_Check
 	Shortcut_Script create
@@ -3259,6 +3260,7 @@ then
 	Create_Symlinks
 	Auto_Startup create 2>/dev/null
 	Auto_Cron create 2>/dev/null
+	Set_Version_Custom_Settings local "$SCRIPT_VERSION"
 	Auto_ServiceEvent create 2>/dev/null
 	Shortcut_Script create
 	_CheckFor_WebGUI_Page_

From e2aed30af869222564bd140e1e99aa182aac3a8e Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:31:18 -0700
Subject: [PATCH 07/11] Update .gitattributes

Updated attributes.
---
 .gitattributes | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 5647e58..b8ba9ce 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,8 +2,11 @@
 *.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 d1e29fde435d58c1a0045f165c74420a23a9379d Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:36:21 -0700
Subject: [PATCH 08/11] Code Improvements

---
 ntpmerlin.sh | 90 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 61 insertions(+), 29 deletions(-)

diff --git a/ntpmerlin.sh b/ntpmerlin.sh
index 7c3c7c9..991a2d2 100644
--- a/ntpmerlin.sh
+++ b/ntpmerlin.sh
@@ -62,8 +62,9 @@ readonly webPageLineTabExp="\{url: \"$webPageFileRegExp\", tabName: "
 readonly webPageLineRegExp="${webPageLineTabExp}\"$SCRIPT_NAME\"\},"
 readonly BEGIN_MenuAddOnsTag="/\*\*BEGIN:_AddOns_\*\*/"
 readonly ENDIN_MenuAddOnsTag="/\*\*ENDIN:_AddOns_\*\*/"
-readonly branchx_TAG="Branch: $SCRIPT_BRANCH"
-readonly version_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}"
+readonly branchxStr_TAG="[Branch: $SCRIPT_BRANCH]"
+readonly versionDev_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}"
+readonly versionMod_TAG="$SCRIPT_VERSION on $ROUTER_MODEL"
 
 # For daily CRON job to trim database #
 readonly defTrimDB_Hour=3
@@ -2480,9 +2481,40 @@ PressEnter()
 	return 0
 }
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Oct-25] ##
+##-------------------------------------##
+_CenterTextStr_()
+{
+    if [ $# -lt 2 ] || [ -z "$1" ] || [ -z "$2" ] || \
+       ! echo "$2" | grep -qE "^[1-9][0-9]+$"
+    then echo ; return 1
+    fi
+    local stringLen="${#1}"
+    local space1Len="$((($2 - stringLen)/2))"
+    local space2Len="$space1Len"
+    local totalLen="$((space1Len + stringLen + space2Len))"
+
+    if [ "$totalLen" -lt "$2" ]
+    then space2Len="$((space2Len + 1))"
+    elif [ "$totalLen" -gt "$2" ]
+    then space1Len="$((space1Len - 1))"
+    fi
+    if [ "$space1Len" -gt 0 ] && [ "$space2Len" -gt 0 ]
+    then printf "%*s%s%*s" "$space1Len" '' "$1" "$space2Len" ''
+    else printf "%s" "$1"
+    fi
+}
+
+##----------------------------------------##
+## Modified by Martinski W. [2025-Oct-25] ##
+##----------------------------------------##
 ScriptHeader()
 {
 	clear
+	local spaceLen=56  colorCT
+	[ "$SCRIPT_BRANCH" = "master" ] && colorCT="$GRNct" || colorCT="$MGNTct"
+
 	DST_ENABLED="$(nvram get time_zone_dst)"
 	if ! Validate_Number "$DST_ENABLED"; then DST_ENABLED=0; fi
 	if [ "$DST_ENABLED" -eq 0 ]; then
@@ -2498,30 +2530,29 @@ ScriptHeader()
 	DST_END="$(echo "$DST_SETTING" | cut -f2 -d",")"
 	DST_END="Month $(echo "$DST_END" | cut -f1 -d".") Week $(echo "$DST_END" | cut -f2 -d".") Weekday $(echo "$DST_END" | cut -f3 -d"." | cut -f1 -d"/") Hour $(echo "$DST_END" | cut -f3 -d"." | cut -f2 -d"/")"
 
-	printf "\n"
-	printf "${BOLD}##############################################################${CLEARFORMAT}\\n"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##           _           __  __              _  _           ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##          | |         |  \/  |            | |(_)          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##    _ __  | |_  _ __  | \  / |  ___  _ __ | | _  _ __     ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##   | '_ \ | __|| '_ \ | |\/| | / _ \| '__|| || || '_ \    ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##   | | | || |_ | |_) || |  | ||  __/| |   | || || | | |   ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##   |_| |_| \__|| .__/ |_|  |_| \___||_|   |_||_||_| |_|   ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##               | |                                        ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##               |_|                                        ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##                 %9s on %-18s          ##${CLEARFORMAT}\n" "$SCRIPT_VERSION" "$ROUTER_MODEL"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##           https://github.com/AMTM-OSR/ntpMerlin          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##     Forked from https://github.com/jackyaz/ntpMerlin     ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##                 DST is currently %-8s                ##${CLEARFORMAT}\n" "$DST_ENABLED"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##      DST starts on %-33s     ##${CLEARFORMAT}\\n" "$DST_START"
-	printf "${BOLD}##      DST ends on %-33s       ##${CLEARFORMAT}\\n" "$DST_END"
-	printf "${BOLD}##                                                          ##${CLEARFORMAT}\\n"
-	printf "${BOLD}##############################################################${CLEARFORMAT}\\n"
-	printf "\n"
+	echo
+	printf "${BOLD}##############################################################${CLRct}\n"
+	printf "${BOLD}##           _           __  __              _  _           ##${CLRct}\n"
+	printf "${BOLD}##          | |         |  \/  |            | |(_)          ##${CLRct}\n"
+	printf "${BOLD}##    _ __  | |_  _ __  | \  / |  ___  _ __ | | _  _ __     ##${CLRct}\n"
+	printf "${BOLD}##   | '_ \ | __|| '_ \ | |\/| | / _ \| '__|| || || '_ \    ##${CLRct}\n"
+	printf "${BOLD}##   | | | || |_ | |_) || |  | ||  __/| |   | || || | | |   ##${CLRct}\n"
+	printf "${BOLD}##   |_| |_| \__|| .__/ |_|  |_| \___||_|   |_||_||_| |_|   ##${CLRct}\n"
+	printf "${BOLD}##               | |                                        ##${CLRct}\n"
+	printf "${BOLD}##               |_|                                        ##${CLRct}\n"
+	printf "${BOLD}##                                                          ##${CLRct}\n"
+	printf "${BOLD}## ${GRNct}%s${CLRct}${BOLD} ##${CLRct}\n" "$(_CenterTextStr_ "$versionMod_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/ntpMerlin          ##${CLRct}\n"
+	printf "${BOLD}##     Forked from https://github.com/jackyaz/ntpMerlin     ##${CLRct}\n"
+	printf "${BOLD}##                                                          ##${CLRct}\n"
+	printf "${BOLD}##                 DST is currently %-8s                ##${CLRct}\n" "$DST_ENABLED"
+	printf "${BOLD}##                                                          ##${CLRct}\n"
+	printf "${BOLD}##      DST starts on %-33s     ##${CLRct}\n" "$DST_START"
+	printf "${BOLD}##      DST ends on %-33s       ##${CLRct}\n" "$DST_END"
+	printf "${BOLD}##                                                          ##${CLRct}\n"
+	printf "${BOLD}##############################################################${CLRct}\n\n"
 }
 
 ##----------------------------------------##
@@ -3237,8 +3268,8 @@ JFFS_LowFreeSpaceStatus="OK"
 updateJFFS_SpaceInfo=false
 
 if [ "$SCRIPT_BRANCH" = "master" ]
-then SCRIPT_VERS_INFO="[$branchx_TAG]"
-else SCRIPT_VERS_INFO="[$version_TAG, $branchx_TAG]"
+then SCRIPT_VERS_INFO=""
+else SCRIPT_VERS_INFO="[$versionDev_TAG]"
 fi
 
 ##----------------------------------------##
@@ -3280,7 +3311,8 @@ case "$1" in
 		exit 0
 	;;
 	startup)
-		Menu_Startup "$2"
+		shift
+		Menu_Startup "$@"
 		exit 0
 	;;
 	generate)

From 3b53eadd5907ddb5fd4e2f724e3be0f1a0fb03e4 Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Thu, 30 Oct 2025 01:06:53 -0700
Subject: [PATCH 09/11] Removed Tomato JS Dependencies

- Removed old Tomato JavaScript file references.
  (No Tomato JS functions were actually used)
---
 README.md         | 2 +-
 ntpdstats_www.asp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d1f43a4..fc335a3 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ntpMerlin
 
 ## v3.4.11
-### Updated on 2025-Oct-25
+### Updated on 2025-Oct-30
 
 ## About
 ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.
diff --git a/ntpdstats_www.asp b/ntpdstats_www.asp
index 8eef937..8c58011 100644
--- a/ntpdstats_www.asp
+++ b/ntpdstats_www.asp
@@ -26,14 +26,12 @@ p{font-weight:bolder}thead.collapsible-jquery{color:#fff;padding:0;width:100%;bo
 <script language="JavaScript" type="text/javascript" src="/popup.js"></script>
 <script language="JavaScript" type="text/javascript" src="/help.js"></script>
 <script language="JavaScript" type="text/javascript" src="/ext/shared-jy/detect.js"></script>
-<script language="JavaScript" type="text/javascript" src="/tmhist.js"></script>
-<script language="JavaScript" type="text/javascript" src="/tmmenu.js"></script>
 <script language="JavaScript" type="text/javascript" src="/client_function.js"></script>
 <script language="JavaScript" type="text/javascript" src="/validator.js"></script>
 <script>
 
 /**----------------------------------------**/
-/** Modified by Martinski W. [2025-Feb-20] **/
+/** Modified by Martinski W. [2025-Oct-27] **/
 /**----------------------------------------**/
 
 var custom_settings;

From 9351f5758a724903bbd627051c91d32e0f94a52a Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Wed, 5 Nov 2025 02:05:59 -0800
Subject: [PATCH 10/11] Code Improvements

- Added process ID to syslog messages.
- Added checks to clean up files when switching from JFFS to USB and vice versa.
- Modified code to re-initialize global parameters after USB-attached drive has been mounted and Entware is found.
---
 README.md    |  2 +-
 ntpmerlin.sh | 36 ++++++++++++++++++++++++------------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index fc335a3..8078837 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ntpMerlin
 
 ## v3.4.11
-### Updated on 2025-Oct-30
+### Updated on 2025-Nov-04
 
 ## About
 ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.
diff --git a/ntpmerlin.sh b/ntpmerlin.sh
index 991a2d2..df15de6 100644
--- a/ntpmerlin.sh
+++ b/ntpmerlin.sh
@@ -14,7 +14,7 @@
 ##     Forked from https://github.com/jackyaz/ntpMerlin     ##
 ##                                                          ##
 ##############################################################
-# Last Modified: 2025-Oct-25
+# Last Modified: 2025-Nov-04
 #-------------------------------------------------------------
 
 ###############       Shellcheck directives      #############
@@ -37,7 +37,7 @@
 readonly SCRIPT_NAME="ntpMerlin"
 readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')"
 readonly SCRIPT_VERSION="v3.4.11"
-readonly SCRIPT_VERSTAG="25102522"
+readonly SCRIPT_VERSTAG="25110422"
 SCRIPT_BRANCH="develop"
 SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
 readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
@@ -138,7 +138,7 @@ Print_Output()
 		    "$PASS") prioNum=6 ;; #INFO#
 		          *) prioNum=5 ;; #NOTICE#
 		esac
-		logger -t "$SCRIPT_NAME" -p $prioNum "$2"
+		logger -t "${SCRIPT_NAME}_[$$]" -p $prioNum "$2"
 	fi
 	printf "${BOLD}${3}%s${CLEARFORMAT}\n\n" "$2"
 }
@@ -1265,6 +1265,7 @@ ScriptStorageLocation()
 			mkdir -p "/opt/share/$SCRIPT_NAME_LOWER.d/"
 			rm -f "/jffs/addons/$SCRIPT_NAME_LOWER.d/ntpdstats.db-shm"
 			rm -f "/jffs/addons/$SCRIPT_NAME_LOWER.d/ntpdstats.db-wal"
+			[ -d "/opt/share/$SCRIPT_NAME_LOWER.d/csv" ] && rm -fr "/opt/share/$SCRIPT_NAME_LOWER.d/csv"
 			mv -f "/jffs/addons/$SCRIPT_NAME_LOWER.d/csv" "/opt/share/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
 			mv -f "/jffs/addons/$SCRIPT_NAME_LOWER.d/config" "/opt/share/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
 			mv -f "/jffs/addons/$SCRIPT_NAME_LOWER.d/config.bak" "/opt/share/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
@@ -1289,6 +1290,7 @@ ScriptStorageLocation()
 			TIMESERVER_NAME="$(TimeServer check)"
 			sed -i 's/^STORAGELOCATION.*$/STORAGELOCATION=jffs/' "$SCRIPT_CONF"
 			mkdir -p "/jffs/addons/$SCRIPT_NAME_LOWER.d/"
+			[ -d "/jffs/addons/$SCRIPT_NAME_LOWER.d/csv" ] && rm -fr "/jffs/addons/$SCRIPT_NAME_LOWER.d/csv"
 			mv -f "/opt/share/$SCRIPT_NAME_LOWER.d/csv" "/jffs/addons/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
 			mv -f "/opt/share/$SCRIPT_NAME_LOWER.d/config" "/jffs/addons/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
 			mv -f "/opt/share/$SCRIPT_NAME_LOWER.d/config.bak" "/jffs/addons/$SCRIPT_NAME_LOWER.d/" 2>/dev/null
@@ -1877,7 +1879,7 @@ _JFFS_WarnLowFreeSpace_()
    then
        JFFS_WarningLogTime update "$currTimeSecs"
        logMsgStr="${logTagStr} JFFS Available Free Space ($1) is getting LOW."
-       logger -t "$SCRIPT_NAME" -p $logPriNum "$logMsgStr"
+       logger -t "${SCRIPT_NAME}_[$$]" -p $logPriNum "$logMsgStr"
    fi
 }
 
@@ -2881,6 +2883,20 @@ Menu_Install()
 	MainMenu
 }
 
+##-------------------------------------##
+## Added by Martinski W. [2025-Nov-04] ##
+##-------------------------------------##
+_SetParameters_()
+{
+    if [ -f "/opt/share/$SCRIPT_NAME_LOWER.d/config" ]
+    then SCRIPT_STORAGE_DIR="/opt/share/$SCRIPT_NAME_LOWER.d"
+    else SCRIPT_STORAGE_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
+    fi
+    SCRIPT_CONF="$SCRIPT_STORAGE_DIR/config"
+    NTPDSTATS_DB="$SCRIPT_STORAGE_DIR/ntpdstats.db"
+    CSV_OUTPUT_DIR="$SCRIPT_STORAGE_DIR/csv"
+}
+
 ##----------------------------------------##
 ## Modified by Martinski W. [2025-Jul-30] ##
 ##----------------------------------------##
@@ -2902,11 +2918,14 @@ Menu_Startup()
 	fi
 
 	NTP_Ready
+	Entware_Ready
+	_SetParameters_
 	Check_Lock
 
 	if [ "$1" != "force" ]; then
 		sleep 7
 	fi
+
 	Create_Dirs
 	Conf_Exists
 	ScriptStorageLocation load true
@@ -3256,14 +3275,7 @@ else sqlDBLogFilePath="/tmp/var/tmp/$sqlDBLogFileName"
 fi
 _SQLCheckDBLogFileSize_
 
-if [ -f "/opt/share/$SCRIPT_NAME_LOWER.d/config" ]
-then SCRIPT_STORAGE_DIR="/opt/share/$SCRIPT_NAME_LOWER.d"
-else SCRIPT_STORAGE_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
-fi
-
-SCRIPT_CONF="$SCRIPT_STORAGE_DIR/config"
-NTPDSTATS_DB="$SCRIPT_STORAGE_DIR/ntpdstats.db"
-CSV_OUTPUT_DIR="$SCRIPT_STORAGE_DIR/csv"
+_SetParameters_
 JFFS_LowFreeSpaceStatus="OK"
 updateJFFS_SpaceInfo=false
 

From f855435ff5013729c7655fda50d4c4ec03f1091c Mon Sep 17 00:00:00 2001
From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com>
Date: Sat, 8 Nov 2025 21:31:26 -0800
Subject: [PATCH 11/11] Update README.md

Updated date string.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8078837..16779bf 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ntpMerlin
 
 ## v3.4.11
-### Updated on 2025-Nov-04
+### Updated on 2025-Nov-08
 
 ## About
 ntpMerlin implements an NTP time server for AsusWRT Merlin with charts for daily, weekly and monthly summaries of performance. A choice between ntpd and chrony is available.