X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=start_server_client_union.sh;h=f6c194fafcff9fd3b89f9fc9eed7d15c2495923d;hb=38329ebbb4971414d1e894a35a680ed81e0bae5d;hp=ad05038c54ff3d3ad4908315260d213d3f1b0181;hpb=033d9244b2685c72d7934dbaaf8288b0f66c5230;p=plomrogue
diff --git a/start_server_client_union.sh b/start_server_client_union.sh
index ad05038..f6c194f 100755
--- a/start_server_client_union.sh
+++ b/start_server_client_union.sh
@@ -11,7 +11,7 @@ fi
# Abort if no proper Python version installed.
test=`command -v python3 | wc -l`
-if [ 1 != $test ]
+if [ 1 -gt $test ]
then
echo "FAILURE:"
echo "No python3 installed, but it's needed!"
@@ -19,20 +19,15 @@ 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.
# This script's wrapper script will read it out on exit.
-./roguelike-server "$@" > log 2>&1 &
+python3 ./roguelike-server "$@" > log 2>&1 &
# Give server some time to start up and exit on error.
sleep 0.01
@@ -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