Handle (non-existence) of log file smarter in start / wrapper scripts.

diff --git a/roguelike b/roguelike
index efb362c98ec526c18210bbddf90762ed8cd79008..a0be8cc77f2e27f15d4e98b28ff8f8a9b9f502fe 100755 (executable)
--- a/roguelike
+++ b/roguelike
@@ -3,4 +3,7 @@
 # Wrapper to the script so that its suppressed server messages get read on exit.
 ./start_server_client_union.sh "$@"
 sync
-cat log
+if [ -e ./log ]
+then
+    cat log
+fi

diff --git a/start_server_client_union.sh b/start_server_client_union.sh
index ac161b5d596fe0d74432c634772a2ea9b60a4290..6199e25e7cd37bf136e2a6b487f7c5b1ec1450f8 100755 (executable)
--- a/start_server_client_union.sh
+++ b/start_server_client_union.sh
@@ -3,6 +3,12 @@
 # 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
@@ -19,8 +25,6 @@ fi
 # 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