16/16: commencement: built mes-boot1!

[guix-commits]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit c9e273f5511616c14ba4a77393fdda23fd3cf7ed
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Fri Nov 30 19:19:39 2018 +0100

    commencement: built mes-boot1!
---
 gnu/packages/commencement.scm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index b129cba..b76d3ea 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -376,17 +376,26 @@
               (invoke "src/mes" "--help")))
           (replace 'install
             (lambda _
+              ;; FIXME: [ is broken in gash
+              (substitute* "install.sh"
+                (("if \\[ (-f [^]]*)\\]" all test) (string-append "if test " 
test))
+                (("if \\[ -z \"\\$srcdest\" \\]") "if test 0 = 0")
+                (("if \\[.*then") "if false; then"))
+
+              (substitute* "install.sh"
+                ;; FIXME: add --exclude to gash tar
+                ((" --exclude=[^ ]*") ""))
+
+              ;; show some progress
+              (substitute* "install.sh"
+                ((" -xf") " -xvf"))
+
               ;; show some progress
               (substitute* "install.sh"
-                ;;(("set -o pipefail" all) (string-append "#" all "\n"))
-                (("if \\[ (-f [^\\]]*)\\]" all test) (string-append "if test " 
test))
-                (("if \\[.*then") "if false; then")
                 (("^( *)((cp|mkdir|tar) [^']*[^\\])\n" all space cmd)
                  (string-append space "echo '" cmd "'\n"
                                 space cmd "\n")))
-              (invoke "sh" "-x" "install.sh")
-              ;;(throw 'barf)
-              )))))
+              (invoke "sh" "-x" "install.sh"))))))
      (native-search-paths
       ;; Use the language-specific variables rather than 'CPATH' because they
       ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.