X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;ds=sidebyside;f=start_server_client_union.sh;h=f6c194fafcff9fd3b89f9fc9eed7d15c2495923d;hb=117674cb8473e064058f6f99d99f7ed4aa2c8779;hp=c56bf06cfa370b21dfde7024d5bcab4922151ced;hpb=c71321a44c10bac2071008d95a9ddd90af8191a5;p=plomrogue
diff --git a/start_server_client_union.sh b/start_server_client_union.sh
index c56bf06..f6c194f 100755
--- a/start_server_client_union.sh
+++ b/start_server_client_union.sh
@@ -19,15 +19,10 @@ then
fi
# Give helpful message to players that want to start without compiling first.
-if [ ! -e ./roguelike-client ]
-then
- echo 'No ./roguelike-client executable found. Try "./redo" first?'
- false
-fi
if [ ! -e ./libplomrogue.so ]
then
- echo 'No ./libplomrogue.so library found. Try "./redo" first?'
- false
+ echo 'No ./libplomrogue.so library found. Building â¦'
+ ./build.sh
fi
# Use shell script's arguments for server and pipe server output to log file.
@@ -44,12 +39,12 @@ kill -0 $! 2> /dev/null
# Give server some time (max. 10 seconds) to generate its worldstate file.
i=0
-while [ ! -e server/worldstate ] && [ $i -le 1000 ]
+while [ ! -e server_run/worldstate ] && [ $i -le 1000 ]
do
sleep 0.01
i=`expr $i + 1`
done
-if [ ! -e server/worldstate ]
+if [ ! -e server_run/worldstate ]
then
echo "Server failed generating worldstate file within given time limit."
false
@@ -57,4 +52,4 @@ fi
# Only start the interface when everything else went well.
kill -0 $! 2> /dev/null
-./roguelike-client
+python3 ./roguelike-client