Skip to content

Support for New AMTM Functionality #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Martinski4GitHub merged 1 commit into from
Feb 18, 2026
Merged

Support for New AMTM Functionality #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ntpMerlin

## v3.4.13
### Updated on 2025-Dec-21
## v3.4.14
### Updated on 2026-Feb-18

## 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.
Expand Down
33 changes: 29 additions & 4 deletions ntpmerlin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
## Forked from https://github.com/jackyaz/ntpMerlin ##
## ##
##############################################################
# Last Modified: 2025-Dec-21
# Last Modified: 2026-Feb-18
#-------------------------------------------------------------

############### Shellcheck directives #############
Expand All @@ -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.13"
readonly SCRIPT_VERSTAG="25122100"
readonly SCRIPT_VERSION="v3.4.14"
readonly SCRIPT_VERSTAG="26021800"
SCRIPT_BRANCH="develop"
SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH"
readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d"
Expand Down Expand Up @@ -66,6 +66,9 @@ readonly branchxStr_TAG="[Branch: $SCRIPT_BRANCH]"
readonly versionDev_TAG="${SCRIPT_VERSION}_${SCRIPT_VERSTAG}"
readonly versionMod_TAG="$SCRIPT_VERSION on $ROUTER_MODEL"

# To support automatic script updates from AMTM #
doScriptUpdateFromAMTM=true

# For daily CRON job to trim database #
readonly defTrimDB_Hour=3
readonly defTrimDB_Mins=7
Expand Down Expand Up @@ -365,6 +368,23 @@ Update_Version()
fi
}

##-------------------------------------##
## Added by Martinski W. [2026-Feb-18] ##
##-------------------------------------##
ScriptUpdateFromAMTM()
{
if ! "$doScriptUpdateFromAMTM"
then
printf "Automatic script updates via AMTM are currently disabled.\n\n"
return 1
fi
if [ $# -gt 0 ] && [ "$1" = "check" ]
then return 0
fi
Update_Version force unattended
return "$?"
}

##----------------------------------------##
## Modified by Martinski W. [2025-Jul-30] ##
##----------------------------------------##
Expand Down Expand Up @@ -3434,7 +3454,7 @@ then
fi

##----------------------------------------##
## Modified by Martinski W. [2025-Jul-30] ##
## Modified by Martinski W. [2026-Feb-18] ##
##----------------------------------------##
case "$1" in
install)
Expand Down Expand Up @@ -3513,6 +3533,11 @@ case "$1" in
Update_Version force
exit 0
;;
amtmupdate)
shift
ScriptUpdateFromAMTM "$@"
exit "$?"
;;
postupdate)
Create_Dirs
Conf_Exists
Expand Down