X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=start_server_client_union.sh;h=74872c773f59651df3d5b893eb515b0864bca33f;hb=a50806df8116a81729220bd79870639b18da9d8c;hp=ac161b5d596fe0d74432c634772a2ea9b60a4290;hpb=621b0c375b81bfb96473638dcdb231f721f31d4a;p=plomrogue

diff --git a/start_server_client_union.sh b/start_server_client_union.sh
index ac161b5..74872c7 100755
--- a/start_server_client_union.sh
+++ b/start_server_client_union.sh
@@ -3,23 +3,31 @@
 # Abort the script on error.
 set -e
 
-# Give helpful message to players that want to start without compiling first.
-if [ ! -e ./roguelike-server ]
+# Don't let any log leftovers from before interfere.
+if [ -e ./log ]
 then
-    echo 'No ./roguelike-server file found to execute. Try "make" first?'
-    false
+    rm log
+fi
+
+# Abort if no proper Python version installed.
+test=`command -v python3 | wc -l`
+if [ 1 -gt $test ]
+then
+    echo "FAILURE:"
+    echo "No python3 installed, but it's needed!"
+    exit 1
 fi
-if [ ! -e ./roguelike-client ]
+
+# Give helpful message to players that want to start without compiling first.
+if [ ! -e ./libplomrogue.so ]
 then
-    echo 'No ./roguelike-client file found to execute. Try "make" first?'
+    echo 'No ./libplomrogue.so library found. Try "./build.sh" first?'
     false
 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 &
-
-echo TEST >> log
+python3 ./roguelike-server "$@" > log 2>&1 &
 
 # Give server some time to start up and exit on error.
 sleep 0.01
@@ -44,4 +52,4 @@ fi
 
 # Only start the interface when everything else went well.
 kill -0 $! 2> /dev/null
-./roguelike-client
+python3 ./roguelike-client