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

Added ability to modify the server.properties file as well as appropriate tab completion

Browse Source
This commit is contained in:
Cameron
2012-07-11 14:18:38 +10:00
parent eb1d9a2efa
commit 3f8c3cc277
3 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bash_completion/msm
View File

@ -118,7 +118,7 @@ _msm() {
__init_server "${COMP_WORDS[1]}" __init_server "${COMP_WORDS[1]}"
if [[ $COMP_CWORD == 2 ]]; then if [[ $COMP_CWORD == 2 ]]; then
options="start stop restart status connected worlds logroll backup jar whitelist blacklist operator gamemode kick say time toggledownfall give xp save cmd cmdlog console" options="start stop restart status connected worlds logroll backup jar whitelist blacklist operator gamemode kick say time toggledownfall give xp save cmd cmdlog console config"
else else
case "${COMP_WORDS[2]}" in case "${COMP_WORDS[2]}" in
stop|restart) stop|restart)
@ -247,6 +247,11 @@ _msm() {
options="on off all" options="on off all"
fi fi
;; ;;
config)
if [[ $COMP_CWORD == 3 ]]; then
options="$(more $SERVER_CONF | sed 's/=.*$//' | grep -v '#')";
fi
;;
esac esac
fi fi

24
init/msm
View File

@ -25,7 +25,7 @@ CONF="${MSM_CONF:-/etc/msm.conf}"
### The Minecraft Server Manager version, use "msm version" to check yours. ### The Minecraft Server Manager version, use "msm version" to check yours.
VERSION="0.4.0" VERSION="0.4.w0"
### Config variables the user should not need/want to change ### Config variables the user should not need/want to change
@ -1980,6 +1980,26 @@ command_server_console() {
fi fi
} }
# Sets a parameter in the config file if it exists otherwise inserts the
# paramerter.
# if the server is running it will do a restart to ensure the parameter is
# loaded
# $1: The server ID
# $2: The parameter
# $3: The value to set it to
command_set_config() {
if [[ -f "${SERVER_CONF[$1]}" ]]; then
if grep "$2" ${SERVER_CONF[$1]} >/dev/null; then
sed -i /$2=/s/.*/"$2=$3"/g ${SERVER_CONF[$1]}
else
echo "$2=$3" >> ${SERVER_CONF[$1]}
fi
fi
if server_is_running "$1"; then
echo "Server is running, restarting in 10secs to ensure update"
command_server_restart $1;
fi
}
### Main Functions ### Main Functions
@ -2742,7 +2762,7 @@ main() {
register_command "<name:server> cmd <strings>" "command_server_cmd" register_command "<name:server> cmd <strings>" "command_server_cmd"
register_command "<name:server> cmdlog <strings>" "command_server_cmdlog" register_command "<name:server> cmdlog <strings>" "command_server_cmdlog"
register_command "<name:server> console" "command_server_console" register_command "<name:server> console" "command_server_console"
register_command "<name:server> config <string> <string>" "command_set_config"
# This function call matches the user input to a registered command # This function call matches the user input to a registered command
# signature, and then calls that commands handler function with positional # signature, and then calls that commands handler function with positional
# arguments containing any variable strings. # arguments containing any variable strings.

2
msm.conf
View File

@ -21,6 +21,7 @@ USERNAME="minecraft"
# Where new servers are stored # Where new servers are stored
SERVER_STORAGE_PATH="/opt/msm/servers" SERVER_STORAGE_PATH="/opt/msm/servers"
DEFAULT_SERVER_CONF="server.properties"
# Where runnable jar files for use by servers are stored # Where runnable jar files for use by servers are stored
JAR_STORAGE_PATH="/opt/msm/jars" JAR_STORAGE_PATH="/opt/msm/jars"
@ -219,3 +220,4 @@ DEFAULT_CONFIRM_XP_FAIL_NO_USER="Can't find user .+"
# The message logged when the experience amount given is an invalid format # The message logged when the experience amount given is an invalid format
DEFAULT_CONFIRM_XP_FAIL_INVALID_AMOUNT="Invalid exp count: .+" DEFAULT_CONFIRM_XP_FAIL_INVALID_AMOUNT="Invalid exp count: .+"