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 redundant uses of NULL.
[plomrogue]
/
start_server_client_union.sh
diff --git
a/start_server_client_union.sh
b/start_server_client_union.sh
index ac161b5d596fe0d74432c634772a2ea9b60a4290..69c959dcab8f633ab03fa514d4d47696e997e964 100755
(executable)
--- a/
start_server_client_union.sh
+++ b/
start_server_client_union.sh
@@
-3,15
+3,21
@@
# Abort the script on error.
set -e
# Abort the script on error.
set -e
+# Don't let any log leftovers from before interfere.
+if [ -e ./log ]
+then
+ rm log
+fi
+
# Give helpful message to players that want to start without compiling first.
if [ ! -e ./roguelike-server ]
then
# Give helpful message to players that want to start without compiling first.
if [ ! -e ./roguelike-server ]
then
- echo 'No ./roguelike-server file found to execute. Try "
make
" first?'
+ echo 'No ./roguelike-server file found to execute. Try "
./redo
" first?'
false
fi
if [ ! -e ./roguelike-client ]
then
false
fi
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
+25,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