Mirrored_Repos/msm
1
0
Fork 0
mirror of https://github.com/msmhq/msm.git synced 2024-08-30 18:12:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "update" and "help" as invalid server names

Browse Source
This commit is contained in:
Marcus Whybrow
2012-08-13 02:49:49 +01:00
parent 36a29a84dc
commit f065622794
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
init/msm
View File

@ -242,11 +242,11 @@ debug() {
# $1: The name to check # $1: The name to check
is_valid_name() { is_valid_name() {
local valid="^[a-zA-Z0-9\_\-]+$" local valid="^[a-zA-Z0-9\_\-]+$"
local invalid="^(start|stop|restart|version|server|jargroup|all|config|\-\-.*)$" local invalid="^(start|stop|restart|version|server|jargroup|all|config|update|help|\-\-.*)$"
if [[ "$1" =~ $valid ]]; then if [[ "$1" =~ $valid ]]; then
if [[ "$1" =~ $invalid ]]; then if [[ "$1" =~ $invalid ]]; then
error_exit INVALID_ARGUMENT "Invalid name \"$1\": A name may not be any of the following reserved worlds \"start\", \"stop\", \"restart\", \"server\", \"version\", \"jargroup\", \"all\", \"config\" or start with two dashes (--)." error_exit INVALID_ARGUMENT "Invalid name \"$1\": A name may not be any of the following reserved worlds \"start\", \"stop\", \"restart\", \"server\", \"version\", \"jargroup\", \"all\", \"config\", \"update\" or \"help\" or start with two dashes (--)."
else else
return 0 return 0
fi fi