set -e
# Use the shell script's arguments to the server's arguments.
-./roguelike-server $@ &
+./roguelike-server "$@" &
# Give server some time to start up and exit on error.
sleep 0.01
# The client should not start if the server is not running. (If the server was
-# running in the foreround, any error exit of it so far would be caught by "set
+# running in the foreground, any error exit of it so far would be caught by "set
# -e" above. But "set -e" is blind to error codes generated in the background.)
kill -0 $! 2> /dev/null
-# Give server some time (max. 10 seconds) to generate its out file.
+# Give server some time (max. 10 seconds) to generate its worldstate file.
i=0
-while [ ! -e server/out ] && [ $i -le 10000 ]
+while [ ! -e server/worldstate ] && [ $i -le 1000 ]
do
sleep 0.01
i=`expr $i + 1`
done
-kill -0 $! 2> /dev/null
+if [ ! -e server/worldstate ]
+then
+ echo "Server failed generating worldstate file within given time limit."
+ false
+fi
# Only start the interface when everything else went well.
+kill -0 $! 2> /dev/null
./roguelike-client