home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove C variant of server, redefine build system to match this change.
[plomrogue]
/
start_server_client_union.sh
diff --git
a/start_server_client_union.sh
b/start_server_client_union.sh
index ac161b5d596fe0d74432c634772a2ea9b60a4290..54a338617274c33171a10b23513c2edfce42ee51 100755
(executable)
--- a/
start_server_client_union.sh
+++ b/
start_server_client_union.sh
@@
-3,15
+3,16
@@
# Abort the script on error.
set -e
# 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
then
- echo 'No ./roguelike-server file found to execute. Try "make" first?'
- false
+ rm log
fi
fi
+
+# Give helpful message to players that want to start without compiling first.
if [ ! -e ./roguelike-client ]
then
if [ ! -e ./roguelike-client ]
then
- echo 'No ./roguelike-client file found to execute. Try "
make
" first?'
+ echo 'No ./roguelike-client file found to execute. Try "
./redo
" first?'
false
fi
false
fi
@@
-19,8
+20,6
@@
fi
# This script's wrapper script will read it out on exit.
./roguelike-server "$@" > log 2>&1 &
# This script's wrapper script will read it out on exit.
./roguelike-server "$@" > log 2>&1 &
-echo TEST >> log
-
# Give server some time to start up and exit on error.
sleep 0.01
# Give server some time to start up and exit on error.
sleep 0.01