summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-05-29 13:49:51 -0400
committerAndrew Cady <d@jerkface.net>2020-05-29 13:49:51 -0400
commit7f5f3687cda9684bb53fa4454a395dd7db860331 (patch)
tree55eaeefde8bd5f55bf616fc80e372d0f2e160d62
parenta8cfddcb6c144b12803e1a33d1f1d3562395f5d1 (diff)
enable fancy output from shake
-rw-r--r--fsmgr.hs11
1 files changed, 9 insertions, 2 deletions
diff --git a/fsmgr.hs b/fsmgr.hs
index 129e61a..b1469ba 100644
--- a/fsmgr.hs
+++ b/fsmgr.hs
@@ -257,9 +257,16 @@ useCGroups = True -- TODO: make command-line option
257handle' :: IO b -> Action a -> Action a 257handle' :: IO b -> Action a -> Action a
258handle' = flip actionOnException 258handle' = flip actionOnException
259 259
260ourShakeOptions :: ShakeOptions
261ourShakeOptions = shakeOptions {
262 shakeFiles = "_build",
263 shakeColor = True,
264 shakeProgress = progressSimple
265}
266
260chrootImage :: FilePath -> [String] -> IO () 267chrootImage :: FilePath -> [String] -> IO ()
261chrootImage target args = 268chrootImage target args =
262 shake shakeOptions {shakeFiles = "_build"} $ do 269 shake ourShakeOptions $ do
263 shakeRules 270 shakeRules
264 action $ do 271 action $ do
265 pid <- show <$> liftIO getProcessID 272 pid <- show <$> liftIO getProcessID
@@ -285,7 +292,7 @@ chrootImage target args =
285 292
286shakeBuildOneImage :: FilePath -> IO () 293shakeBuildOneImage :: FilePath -> IO ()
287shakeBuildOneImage target = 294shakeBuildOneImage target =
288 shake shakeOptions {shakeFiles = "_build"} $ do 295 shake ourShakeOptions $ do
289 want [target -<.> "btrfs"] 296 want [target -<.> "btrfs"]
290 shakeRules 297 shakeRules
291 298