home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plugin: Clean up imports.
[plomrogue]
/
start_server_client_union.sh
diff --git
a/start_server_client_union.sh
b/start_server_client_union.sh
index 116a18858730db1d08d348642cf8c3dbe55228cc..f6c194fafcff9fd3b89f9fc9eed7d15c2495923d 100755
(executable)
--- 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`
# 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!"
then
echo "FAILURE:"
echo "No python3 installed, but it's needed!"
@@
-19,15
+19,10
@@
then
fi
# Give helpful message to players that want to start without compiling first.
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
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.
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
# 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
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
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
# Only start the interface when everything else went well.
kill -0 $! 2> /dev/null
-./roguelike-client
+
python3
./roguelike-client