From 74b205273916495dde0f9bf1d8488995cc28385c Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Fri, 26 Jun 2020 19:42:57 +0200
Subject: [PATCH] Improve error message

---
 overlays/testing.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/overlays/testing.nix b/overlays/testing.nix
index 75dfb97b..b43344c6 100644
--- a/overlays/testing.nix
+++ b/overlays/testing.nix
@@ -11,13 +11,14 @@ let
     main = do
       (configDir:hostname:args) <-  getArgs
       paths <- myNixPath $ toText configDir
-      let command = ${commandline}
-      bracket
-        (mktemp |> captureTrim)
-        rm
-        (\logFile -> do
-          say [i|Trying to build ${name} config for #{hostname}. Logging to #{logFile}.|]
-          onException (command &!> StdOut &> Append logFile) (say [i|### Build failure for ${name} config for #{hostname} ###|] >> cat logFile))
+      logFile <- mktemp |> captureTrim
+      \logFile -> do
+        let command = (${commandline}) &!> StdOut &> Append logFile
+            failHandler = do
+              say [i|### Build failure for ${name} config for #{hostname} ###|]
+              cat logFile
+        say [i|Trying to build ${name} config for #{hostname}. Logging to #{logFile}.|]
+        onException command
       say [i|Build of ${name} config for #{hostname} was successful.|]
   '';
 in {