X-Git-Url: https://plomlompom.com/repos/test.html?a=blobdiff_plain;f=roguelike;h=8ca2871a42c998aa1c0258c8474e4027cedc9549;hb=1d09b2399527569b3a8cea18abf44cad33248719;hp=2143f05623a0c98136634c7475aaa5c565d7a707;hpb=dd9d65ee727ac7e95801da0f8b5bae7009811802;p=plomrogue
diff --git a/roguelike b/roguelike
index 2143f05..8ca2871 100755
--- a/roguelike
+++ b/roguelike
@@ -1,30 +1,32 @@
#!/bin/sh
-# This is only to ensure I write no unintentional bashisms.
-set -o posix
-
# Abort the script on error.
set -e
-# Use the shell script's arguments to the server's arguments.
-./roguelike-server $@ &
+# Use shell script's arguments for server and pipe server output to log file.
+./roguelike-server "$@" > log 2>&1 &
# 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