Skip to content

Fine-Tuning Code #68

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
Dec 16, 2025
Merged

Fine-Tuning Code #68

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 @@
# 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.
Expand Down
21 changes: 8 additions & 13 deletions scmerlin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
## Forked from: https://github.com/jackyaz/scMerlin ##
## ##
######################################################
# Last Modified: 2025-Dec-12
# Last Modified: 2025-Dec-15
#-----------------------------------------------------

########## Shellcheck directives ###########
Expand All @@ -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"
Expand Down Expand Up @@ -2892,7 +2892,6 @@ _Menu_Services_()
done

"$exitMenu" && return 0
ScriptHeader
_Menu_Services_
}

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -3002,7 +3001,6 @@ _Menu_OpenVPN_()
done

"$exitMenu" && return 0
ScriptHeader
_Menu_OpenVPN_
}

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -3116,7 +3114,6 @@ _Menu_WireGuard_()
done

"$exitMenu" && return 0
ScriptHeader
_Menu_WireGuard_
}

Expand Down Expand Up @@ -3311,7 +3308,6 @@ _Menu_RouterUtilities_()
done

"$exitMenu" && return 0
ScriptHeader
_Menu_RouterUtilities_
}

Expand Down Expand Up @@ -3406,7 +3402,6 @@ _Menu_ToggleOptions_()
done

"$exitMenu" && return 0
ScriptHeader
_Menu_ToggleOptions_
}

Expand Down