diff --git a/.gitattributes b/.gitattributes index 8d510d02..b8ba9ce8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,9 @@ +* 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 diff --git a/README.md b/README.md index e8f718af..b92ea1eb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # spdMerlin ## v4.4.15 -### Updated on 2025-Oct-19 +### Updated on 2025-Oct-25 ## About spdMerlin is an internet speedtest and monitoring tool for AsusWRT Merlin with charts for daily, weekly and monthly summaries. It tracks download/upload bandwidth as well as latency, jitter and packet loss. diff --git a/spdmerlin.sh b/spdmerlin.sh index 6381aa90..21dbb56d 100644 --- a/spdmerlin.sh +++ b/spdmerlin.sh @@ -14,7 +14,7 @@ ## Forked from https://github.com/jackyaz/spdMerlin ## ## ## ############################################################## -# Last Modified: 2025-Oct-19 +# Last Modified: 2025-Oct-25 #------------------------------------------------------------- ############## Shellcheck directives ############# @@ -39,7 +39,7 @@ readonly SCRIPT_NAME="spdMerlin" readonly SCRIPT_NAME_LOWER="$(echo "$SCRIPT_NAME" | tr 'A-Z' 'a-z')" readonly SCRIPT_VERSION="v4.4.15" -readonly SCRIPT_VERSTAG="25101906" +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" @@ -4193,8 +4193,8 @@ ScriptHeader() 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"