From 7f5f3687cda9684bb53fa4454a395dd7db860331 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Fri, 29 May 2020 13:49:51 -0400 Subject: enable fancy output from shake --- fsmgr.hs | 11 +++++++++-- 1 file 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 handle' :: IO b -> Action a -> Action a handle' = flip actionOnException +ourShakeOptions :: ShakeOptions +ourShakeOptions = shakeOptions { + shakeFiles = "_build", + shakeColor = True, + shakeProgress = progressSimple +} + chrootImage :: FilePath -> [String] -> IO () chrootImage target args = - shake shakeOptions {shakeFiles = "_build"} $ do + shake ourShakeOptions $ do shakeRules action $ do pid <- show <$> liftIO getProcessID @@ -285,7 +292,7 @@ chrootImage target args = shakeBuildOneImage :: FilePath -> IO () shakeBuildOneImage target = - shake shakeOptions {shakeFiles = "_build"} $ do + shake ourShakeOptions $ do want [target -<.> "btrfs"] shakeRules -- cgit v1.2.3