From bf40dbdea1913109576ecd06057f4db9263dd2f0 Mon Sep 17 00:00:00 2001
From: Yorhel <git@yorhel.nl>
Date: Sun, 18 Mar 2018 10:43:48 +0100
Subject: Fix Docker init script for Mac + add some spacing around
 vndb-dev-server.pl output

---
 util/vndb-dev-server.pl | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'util/vndb-dev-server.pl')

diff --git a/util/vndb-dev-server.pl b/util/vndb-dev-server.pl
index a712d094..763748b6 100755
--- a/util/vndb-dev-server.pl
+++ b/util/vndb-dev-server.pl
@@ -51,14 +51,16 @@ sub prog_stop {
 
 
 sub make_run {
-    my $cb = run_cmd "make -C $ROOT",
-        '>', sub {
-            my $d = shift||'';
-            return if $d =~ /(Entering|Leaving) directory '\Q$ROOT\E'/;
-            return if $d =~ /Nothing to be done for 'all'/;
-            print $d;
-        };
+    my $newline = 0;
+    my $out = sub {
+        my $d = shift||'';
+        return if !$d || $d =~ /Nothing to be done for 'all'/;
+        print "\n" if !$newline++;
+        print $d;
+    };
+    my $cb = run_cmd "cd $ROOT && make", '>', $out, '2>', $out;
     $cb->recv;
+    print "\n" if $newline;
 }
 
 
@@ -136,7 +138,7 @@ while(1) {
     if($needcheck+2 < time) {
         make_run;
         if(checkmod) {
-            print "File has been modified, restarting server.\n";
+            print "\nFile has been modified, restarting server.\n\n";
             prog_stop;
             prog_start;
         } elsif(!$prog) {
-- 
cgit v1.2.3