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 #204 from IronTetsubo/issue198

Browse Source 
Fixed issue #198
This commit is contained in:
Zach Latta 2013-09-13 19:22:31 -07:00
commit 5653c8d0c1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/msm
View File

@ -393,12 +393,13 @@ world_backup() {
# $1: The ID of the world # $1: The ID of the world
world_activate() { world_activate() {
server_property "${WORLD_SERVER_ID[$1]}" USERNAME server_property "${WORLD_SERVER_ID[$1]}" USERNAME
server_property "${WORLD_SERVER_ID[$1]}" WORLD_STORAGE_PATH
world_property "$1" INACTIVE_PATH world_property "$1" INACTIVE_PATH
world_property "$1" ACTIVE_PATH world_property "$1" ACTIVE_PATH
if [ -d "${WORLD_INACTIVE_PATH[$1]}" ]; then if [ -d "${WORLD_INACTIVE_PATH[$1]}" ]; then
echo -n "Moving world \"${WORLD_NAME[$1]}\" to the active worldstorage directory... " echo -n "Moving world \"${WORLD_NAME[$1]}\" to the active worldstorage directory... "
local new_path="${WORLD_ACTIVE_PATH[$1]}" local new_path="${SERVER_WORLD_STORAGE_PATH[${WORLD_SERVER_ID[$1]}]}"
as_user "${SERVER_USERNAME[${WORLD_SERVER_ID[$1]}]}" "mkdir -p \"$new_path\" && mv \"${WORLD_INACTIVE_PATH[$1]}\" \"$new_path\"" as_user "${SERVER_USERNAME[${WORLD_SERVER_ID[$1]}]}" "mkdir -p \"$new_path\" && mv \"${WORLD_INACTIVE_PATH[$1]}\" \"$new_path\""
echo "Done." echo "Done."
else else
@ -414,6 +415,7 @@ world_activate() {
# $1: The ID of the world # $1: The ID of the world
world_deactivate() { world_deactivate() {
server_property "${WORLD_SERVER_ID[$1]}" USERNAME server_property "${WORLD_SERVER_ID[$1]}" USERNAME
server_property "${WORLD_SERVER_ID[$1]}" WORLD_STORAGE_INACTIVE_PATH
world_property "$1" ACTIVE_PATH world_property "$1" ACTIVE_PATH
world_property "$1" INACTIVE_PATH world_property "$1" INACTIVE_PATH
world_property "$1" PATH world_property "$1" PATH
@ -423,7 +425,7 @@ world_deactivate() {
else else
if [ -d "${WORLD_ACTIVE_PATH[$1]}" ]; then if [ -d "${WORLD_ACTIVE_PATH[$1]}" ]; then
echo -n "Moving world \"${WORLD_NAME[$1]}\" to the inactive worldstorage directory... " echo -n "Moving world \"${WORLD_NAME[$1]}\" to the inactive worldstorage directory... "
local new_path="${WORLD_INACTIVE_PATH[$1]}" local new_path="${SERVER_WORLD_STORAGE_INACTIVE_PATH[${WORLD_SERVER_ID[$1]}]}"
as_user "${SERVER_USERNAME[${WORLD_SERVER_ID[$1]}]}" "mkdir -p \"$new_path\" && mv \"${WORLD_PATH[$1]}\" \"$new_path\"" as_user "${SERVER_USERNAME[${WORLD_SERVER_ID[$1]}]}" "mkdir -p \"$new_path\" && mv \"${WORLD_PATH[$1]}\" \"$new_path\""
echo "Done." echo "Done."
else else