From 347cefc614becd10bfff776d520c264327b86e3a Mon Sep 17 00:00:00 2001
From: David Brown <dave@brownsmeet.com>
Date: Fri, 15 Jul 2016 16:58:45 +0100
Subject: [PATCH] Fix quoting of parameters passed through to 64 bit shell.

---
 src/tools/make/buildall.pl | 24 +++++++++++++++++++++---
 src/tools/make/postpush.pl |  3 ++-
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl
index b2536704..e00b76d5 100755
--- a/src/tools/make/buildall.pl
+++ b/src/tools/make/buildall.pl
@@ -6,15 +6,33 @@ use Cwd;
 
 my $branch = "master";
 
+----
+
+my $mkcmd =
+#   "export CC=gcc && make full;"
+# . "export CC=i686-w64-mingw32-gcc && make full;"
+# .
+  "cd ~;"
+. "sh start64.sh \\\"cd vishaps/voc && git checkout $branch && git pull;"
+                  . "make full;"
+                  . "export CC=x86_64-w64-mingw32-gcc && make full\\\"";
+
+my $cmd = "ssh -p5932 dave\@wax \"cd vishaps/voc && git checkout $branch && git pull && $mkcmd\" ";
+print $cmd, "\n";
+
+system($cmd);
+
+----
+
 my %machines = (
   "pi"      => ['pi@pie',          "sudo", "projects/oberon/vishap/voc", "make full"],
   "darwin"  => ['dave@dcb',        "sudo", "projects/oberon/vishap/voc", "make full"],
   "wind"    => ['-p5932 dave@wax', "",     "vishaps/voc",                "export CC=gcc && make full;"
                                                                        . "export CC=i686-w64-mingw32-gcc && make full;"
                                                                        . "cd ~;"
-                                                                       . "sh start64.sh \"cd vishaps/voc && git checkout $branch && git pull\";"
-                                                                       . "sh start64.sh \"cd vishaps/voc && make full\";"
-                                                                       . "sh start64.sh \"cd vishaps/voc && export CC=x86_64-w64-mingw32-gcc && make full\""],
+                                                                       . "sh start64.sh \\\"cd vishaps/voc && git checkout $branch && git pull;"
+                                                                                         . "make full;"
+                                                                                         . "export CC=x86_64-w64-mingw32-gcc && make full\\\""],
   "android" => ['-p8022 root@and', "",     "vishap/voc",                 "export CC=gcc && make full"],
   "lub32"   => ['dave@lub32',      "sudo", "vishap/voc",                 "make full"],
   "ob32"    => ['root@nas-ob32',   "",     "vishap/voc",                 "make full"],
diff --git a/src/tools/make/postpush.pl b/src/tools/make/postpush.pl
index 43a4b548..2b3a2ad6 100755
--- a/src/tools/make/postpush.pl
+++ b/src/tools/make/postpush.pl
@@ -43,7 +43,8 @@ if ($buildneeded) {
     writelog "Started buildall, pid = $child.";  # parent process
   } else {
     close(STDIN); close(STDOUT); close(STDERR);  # child process
-    system '(cd voc && git pull) >postpush.log';
+    system 'echo Syncing voc>postpush.log';
+    system '(cd voc && git pull) >>postpush.log';
     exec 'perl voc/src/tools/make/buildall.pl >/tmp/buildall.log';
     exit;
   }