diff --git a/README.md b/README.md index 0269d31..a0f73c9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # scMerlin -## v2.5.47 -### Updated on 2025-Dec-12 +## v2.5.48 +### Updated on 2025-Dec-15 ## 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 c54fce5..0a720e3 100644 --- a/scmerlin.sh +++ b/scmerlin.sh @@ -12,7 +12,7 @@ ## Forked from: https://github.com/jackyaz/scMerlin ## ## ## ###################################################### -# Last Modified: 2025-Dec-12 +# Last Modified: 2025-Dec-15 #----------------------------------------------------- ########## 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.47" -readonly SCRIPT_VERSION="v2.5.47" -readonly SCRIPT_VERSTAG="25121220" +readonly SCM_VERSION="v2.5.48" +readonly SCRIPT_VERSION="v2.5.48" +readonly SCRIPT_VERSTAG="25121520" SCRIPT_BRANCH="develop" SCRIPT_REPO="https://raw.githubusercontent.com/AMTM-OSR/$SCRIPT_NAME/$SCRIPT_BRANCH" readonly SCRIPT_DIR="/jffs/addons/$SCRIPT_NAME_LOWER.d" @@ -2892,7 +2892,6 @@ _Menu_Services_() done "$exitMenu" && return 0 - ScriptHeader _Menu_Services_ } @@ -2910,7 +2909,7 @@ _Menu_OpenVPN_() if _CheckFor_OpenVPN_Clients_Available_ then printf " ${BOLDUNDERLN}${GRNct}OpenVPN Clients${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the OpenVPN Client)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Client)${CLRct}\n\n" vpnClientNum=1 while [ "$vpnClientNum" -lt 6 ] do @@ -2936,7 +2935,7 @@ _Menu_OpenVPN_() if _CheckFor_OpenVPN_Servers_Available_ then printf "\n ${BOLDUNDERLN}${GRNct}OpenVPN Servers${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the OpenVPN Server)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Server)${CLRct}\n\n" vpnServerNum=1 while [ "$vpnServerNum" -lt 3 ] do @@ -3002,7 +3001,6 @@ _Menu_OpenVPN_() done "$exitMenu" && return 0 - ScriptHeader _Menu_OpenVPN_ } @@ -3020,7 +3018,7 @@ _Menu_WireGuard_() if _CheckFor_WireGuard_Clients_Available_ then printf " ${BOLDUNDERLN}${GRNct}WireGuard Clients${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting an option will restart the WireGuard Client)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting an option will restart the Client)${CLRct}\n\n" vpnClientNum=1 while [ "$vpnClientNum" -lt 6 ] do @@ -3047,7 +3045,7 @@ _Menu_WireGuard_() if _CheckFor_WireGuard_Servers_Available_ then printf "\n ${BOLDUNDERLN}${GRNct}WireGuard Server${CLRct}\n" - printf " ${BOLD}${WARN}(Selecting the option will restart the WireGuard Server)${CLRct}\n\n" + printf " ${BOLD}${WARN}(Selecting the option will restart the Server)${CLRct}\n\n" vpnServerNum=1 ## Currently only ONE WireGuard Server is available ## if _IsWireGuard_Server_Configured_ "$vpnServerNum" then @@ -3116,7 +3114,6 @@ _Menu_WireGuard_() done "$exitMenu" && return 0 - ScriptHeader _Menu_WireGuard_ } @@ -3311,7 +3308,6 @@ _Menu_RouterUtilities_() done "$exitMenu" && return 0 - ScriptHeader _Menu_RouterUtilities_ } @@ -3406,7 +3402,6 @@ _Menu_ToggleOptions_() done "$exitMenu" && return 0 - ScriptHeader _Menu_ToggleOptions_ }