176/207: mescc-tools-boot: Cleanup.

[Jan Nieuwenhuizen]

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

commit 5c939f4b0567dd831535e1a5fe33efb91485eba6
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Mon Sep 3 10:46:07 2018 +0200

    mescc-tools-boot: Cleanup.
    
    * gnu/packages/commencement.scm (mescc-tools-boot): Cleanup.
---
 gnu/packages/commencement.scm | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5e1b0f8..486ede3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -152,22 +152,19 @@
                        (mes-seed (assoc-ref %build-inputs "mes-seed"))
                        (mes-source (assoc-ref %build-inputs "mes-source"))
                        (out (assoc-ref %outputs "out")))
-                  (setenv "PATH" (string-append coreutils "/bin"))
-                  (format (current-error-port) "PATH=~s\n" (getenv "PATH"))
                   (with-directory-excursion ".."
                     (and
                      (mkdir-p "mescc-tools-seed")
-                     (zero? (system* "tar" "--strip=1" "-C" "mescc-tools-seed"
-                                     "-xvf" mescc-tools-seed))
+                     (invoke "tar" "--strip=1" "-C" "mescc-tools-seed"
+                             "-xvf" mescc-tools-seed)
                      (mkdir-p "mes-source")
-                     (zero? (system* "tar" "--strip=1" "-C" "mes-source"
-                                     "-xvf" mes-source))
+                     (invoke "tar" "--strip=1" "-C" "mes-source"
+                             "-xvf" mes-source)
                      (mkdir-p "mes-seed")
-                     (zero? (system* "tar" "--strip=1" "-C" "mes-seed"
-                                     "-xvf" mes-seed)))))))
+                     (invoke "tar" "--strip=1" "-C" "mes-seed"
+                             "-xvf" mes-seed))))))
             (replace 'configure
               (lambda* (#:key outputs #:allow-other-keys)
-                ;;(use-modules (guix build utils))
                 (let ((coreutils (assoc-ref %build-inputs "coreutils"))
                       (out (assoc-ref %outputs "out")))
                   (setenv "PATH" (string-append coreutils "/bin"
@@ -178,14 +175,14 @@
                   (setenv "MESCC_TOOLS_SEED" "../mescc-tools-seed")
                   (setenv "MES_SEED" "../mes-seed"))))
             (replace 'build
-              (lambda* (#:key outputs #:allow-other-keys)
-                (zero? (system* "sh" "build.sh"))))
+              (lambda _
+               (invoke "sh" "build.sh")))
             (replace 'check
-              (lambda* (#:key outputs #:allow-other-keys)
-                (zero? (system* "sh" "check.sh"))))
+              (lambda _
+                (invoke "sh" "check.sh")))
             (replace 'install
-              (lambda* (#:key outputs #:allow-other-keys)
-                (zero? (system* "sh" "install.sh")))))))))))
+              (lambda _
+                (invoke "sh" "install.sh"))))))))))
 
 (define-public nyacc-boot
   (let ((version "0.80.42")