Update scripts to make mapserver function properly the first time

diff --git a/scripts/common.sh b/scripts/common.sh
index a6941f4c81919d668cad990343e12353e4bb1cb2..73fc5f2293ea0c337d81b5d0f336356264f1723c 100644 (file)
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -68,9 +68,12 @@ function run_in_screen {
 }
 
 function start_mapserver {
-       echo -n "Starting Mapserver... "
+       echo -n "Starting mapserver... "
        if ! mapserver_running; then
                cd worlds/creative
+               while ! [ -f map.sqlite ]; do
+                       sleep 0.1
+               done
                run_in_screen `mapserver_screenname` `mapserver_lock` "./mapserver-linux-x86_64"
                cd ../..
                echo -e "\e[32mDone\e[0m"

diff --git a/scripts/restart.sh b/scripts/restart.sh
index c83f46dab01a0d783a461edb530d119e13e66739..ae6ee4b134cbb04f0f2639366acf169b735ec1e4 100755 (executable)
--- a/scripts/restart.sh
+++ b/scripts/restart.sh
@@ -6,9 +6,9 @@ source scripts/common.sh
 
 case $1 in
        "--all")
-               restart_mapserver
-               restart_multiserver
                loop_worlds restart_world
+               restart_multiserver
+               restart_mapserver
                ;;
        "--worlds")
                loop_worlds restart_world

diff --git a/scripts/start.sh b/scripts/start.sh
index 961581c0f7671ee5367e1354cbbe14714eb2f4df..720692a238624999826a2ebe270b985954dde89c 100755 (executable)
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -6,9 +6,9 @@ source scripts/common.sh
 
 case $1 in
        "--all")
-               start_mapserver
-               start_multiserver
                loop_worlds start_world
+               start_multiserver
+               start_mapserver
                ;;
        "--worlds")
                loop_worlds start_world

diff --git a/scripts/stop.sh b/scripts/stop.sh
index d8493bfbcda84bdf43980ae201332f7fe326b217..e83300ed0f3b72d5193805eb9693fa4eace6fb11 100755 (executable)
--- a/scripts/stop.sh
+++ b/scripts/stop.sh
@@ -6,9 +6,9 @@ source scripts/common.sh
 
 case $1 in
        "--all")
-               stop_mapserver
-               stop_multiserver
                loop_worlds stop_world
+               stop_multiserver
+               stop_mapserver
                ;;
        "--worlds")
                loop_worlds stop_world