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

Merge pull request #191 from marcuswhybrow/world-creation-location

Browse Source 
Fixes #26 by ensuring a symlink for level-name exists to worldstorage be...
This commit is contained in:
Marcus Whybrow 2013-09-02 16:43:24 -07:00
commit 175eb17428
1 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
init/msm
View File

@ -610,11 +610,40 @@ server_ensure_jar() {
error_exit FILE_NOT_FOUND "Could not find jar for server \"${SERVER_NAME[$1]}\": Expected \"${SERVER_JAR_PATH[$1]}\"." error_exit FILE_NOT_FOUND "Could not find jar for server \"${SERVER_NAME[$1]}\": Expected \"${SERVER_JAR_PATH[$1]}\"."
} }
# Read a value from the server configuration file
# $1: The id of the server
# $2: The setting name to read
server_read_config() {
unset RETURN
# Convert name into upper-case with underscores
# msm-setting => SERVER_SETTING
# setting => SERVER_PROPERTIES_SETTING
if [[ "$2" =~ ^msm\-(.*)$ ]]; then
to_global_name "${BASH_REMATCH[1]}"
else
to_global_name "PROPERTIES_$2"
fi
local name="$RETURN"
# Display the value of that setting
unset RETURN
server_property "$1" "$name"
eval RETURN=\"\${SERVER_$name[$1]}\"
}
# Creates symbolic links in the server directory (SETTINGS_SERVER_STORAGE_PATH) for each # Creates symbolic links in the server directory (SETTINGS_SERVER_STORAGE_PATH) for each
# of the Minecraft worlds located in the world storage directory. # of the Minecraft worlds located in the world storage directory.
# $1: The id of the server for which links should be ensured # $1: The id of the server for which links should be ensured
server_ensure_links() { server_ensure_links() {
server_property "$1" USERNAME server_property "$1" USERNAME
server_property "$1" WORLD_STORAGE_PATH
# Ensure a directory for level-name exists in worldstorage.
# This prevents allows a symlink to be created, and prevents new worlds
# being generated outside of worldstorage.
command_server_config "$1" "level-name"
as_user "${SERVER_USERNAME[$1]}" "mkdir -p \"${SERVER_WORLD_STORAGE_PATH[$1]}/$RETURN\""
server_worlds_allocate "$1"
echo -n "Maintaining world symbolic links... " echo -n "Maintaining world symbolic links... "
local start="${SERVER_WORLD_OFFSET[$1]}" local start="${SERVER_WORLD_OFFSET[$1]}"
@ -3106,20 +3135,8 @@ command_server_config() {
# If only a setting name is given # If only a setting name is given
if [ ! -z "$2" ]; then if [ ! -z "$2" ]; then
server_read_config "$1" "$2"
# Convert name into upper-case with underscores echo "$RETURN"
# msm-setting => SERVER_SETTING
# setting => SERVER_PROPERTIES_SETTING
if [[ "$2" =~ ^msm\-(.*)$ ]]; then
to_global_name "${BASH_REMATCH[1]}"
else
to_global_name "PROPERTIES_$2"
fi
local name="$RETURN"
# Display the value of that setting
server_property "$1" "$name"
eval echo \"\${SERVER_$name[$1]}\"
fi fi
# If no paramter name is given # If no paramter name is given