From 60adec5f26a5ccde45a210cdae23a94ff3ee1515 Mon Sep 17 00:00:00 2001 From: Martinski4GitHub <119833648+Martinski4GitHub@users.noreply.github.com> Date: Sun, 23 Nov 2025 23:09:56 -0800 Subject: [PATCH] Code Improvements Minor code improvements. --- README.md | 4 ++-- scmerlin.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 3c83865..865bade 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin -## v2.5.45 -### Updated on 2025-Nov-07 +## v2.5.46 +### Updated on 2025-Nov-23 ## About scMerlin allows you to easily control the most common services/scripts on your router. scMerlin also augments your router's WebUI with a Sitemap and dynamic submenus for the main left menu of Asuswrt-Merlin. diff --git a/scmerlin.sh b/scmerlin.sh index 26a472b..6aa8706 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2025-Nov-03 +# Last Modified: 2025-Nov-23 #----------------------------------------------------- ########## Shellcheck directives ########### @@ -32,9 +32,9 @@ ### Start of script variables ### readonly SCRIPT_NAME="scMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z' | sed 's/d//')" -readonly SCM_VERSION="v2.5.45" -readonly SCRIPT_VERSION="v2.5.45" -readonly SCRIPT_VERSTAG="25110320" +readonly SCM_VERSION="v2.5.46" +readonly SCRIPT_VERSION="v2.5.46" +readonly SCRIPT_VERSTAG="25112322" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -1872,8 +1872,8 @@ else if [ "$ntpTimerSecs" -gt 0 ] && [ "$((ntpTimerSecs % 30))" -eq 0 ] then /usr/bin/logger -st ntpBootWatchdog "Still waiting for NTP to sync [$ntpTimerSecs secs]..." - killall ntp - killall ntpd + killall -q ntp + killall -q ntpd service restart_ntpd fi sleep 10