syncing changes from branch 'master' with feature-adjust-mirrored-backups

This commit is contained in:
Jonas W. Carson 2017-01-03 14:01:38 -05:00
commit 85536bc569

2
msctl
View File

@ -1035,7 +1035,7 @@ start() {
fi
# Check for a clean dismount from the previous server run. If we have a
# <world>-original directory within <world> we didn't stop cleanly.
if [ -d "WORLDS_LOCATION/$1/$1-original" ]; then
if [ -d "$WORLDS_LOCATION/$1/$1-original" ]; then
# Remove the symlink to the world-file mirror image.
# if recently restored from backup, this symlink may or may not exist
if [ -L "$WORLDS_LOCATION/$1/$1" ]; then