>From f0c99fd65064025510a85492c05682e2adab2b5d Mon Sep 17 00:00:00 2001
From: Evan Hanson <address@hidden>
Date: Sun, 9 Sep 2018 16:56:17 +1200
Subject: [PATCH 1/2] Fix double-quotation of custom shell commands

---
 egg-compile.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/egg-compile.scm b/egg-compile.scm
index 714930b8..24735ddb 100644
--- a/egg-compile.scm
+++ b/egg-compile.scm
@@ -507,7 +507,7 @@
            " -C -I" srcdir (arglist opts platform) 
            " " src " -o " out " : "
            src " " (qs* eggfile platform) " "
-           (if custom (qs* cmd platform) "") " "
+           (if custom cmd "") " "
            (filelist srcdir source-dependencies platform))
     (print-end-command platform)))
 
@@ -547,7 +547,7 @@
            " -setup-mode -I " srcdir " -C -I" srcdir
 	   (arglist opts platform) (arglist link-options platform)
 	   " " src " -o " out " : " src " " (qs* eggfile platform) " "
-           (if custom (qs* cmd platform) "") " "
+           (if custom cmd "") " "
            (filelist srcdir source-dependencies platform))
     (print-end-command platform)))
 
@@ -599,7 +599,7 @@
            " -I " srcdir " -C -I" srcdir (arglist opts platform)
            (arglist link-options platform) " " src " -o " out " : "
            src " " (qs* eggfile platform) " "
-           (if custom (qs* cmd platform) "") " "
+           (if custom cmd "") " "
            (filelist srcdir source-dependencies platform))
     (print-end-command platform)))
 
@@ -630,21 +630,20 @@
            srcdir (arglist opts platform)
            (arglist link-options platform) " " src " -o " out " : "
            src " " (qs* eggfile platform) " "
-           (if custom (qs* cmd platform) "") " "
+           (if custom cmd "") " "
            (filelist srcdir source-dependencies platform))
     (print-end-command platform)))
 
 (define ((compile-generated-file name #!key source custom
                                  source-dependencies eggfile) 
          srcdir platform)
-  (let* ((cmd (custom-cmd custom srcdir platform))
+  (let* ((cmd (qs* (custom-cmd custom srcdir platform) platform))
          (sname (prefix srcdir name))
          (ssname (and source (prefix srcdir source)))
          (out (qs* (or ssname sname) platform)))
     (prepare-custom-command cmd platform)
     (print "\n" (qs* default-builder platform #t)
-           " " out " " cmd " : " 
-           (qs* cmd platform) " "
+           " " out " " cmd " : " cmd " "
            (qs* eggfile platform) " "
            (filelist srcdir source-dependencies platform))
     (print-end-command platform)))
@@ -964,7 +963,8 @@ EOF
   (case platform
     ((unix) (string-append "${" var "}"))
     ((windows) (string-append "%" var "%"))))
-  
+
+;; NOTE `cmd' must already be quoted for shell
 (define (prepare-custom-command cmd platform)
   (unless (eq? 'windows platform)
     (print "chmod +x " cmd)))
-- 
2.11.0