diff options
author | Andrew Cady <d@jerkface.net> | 2020-05-29 13:49:51 -0400 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2020-05-29 13:49:51 -0400 |
commit | 7f5f3687cda9684bb53fa4454a395dd7db860331 (patch) | |
tree | 55eaeefde8bd5f55bf616fc80e372d0f2e160d62 | |
parent | a8cfddcb6c144b12803e1a33d1f1d3562395f5d1 (diff) |
enable fancy output from shake
-rw-r--r-- | fsmgr.hs | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -257,9 +257,16 @@ useCGroups = True -- TODO: make command-line option | |||
257 | handle' :: IO b -> Action a -> Action a | 257 | handle' :: IO b -> Action a -> Action a |
258 | handle' = flip actionOnException | 258 | handle' = flip actionOnException |
259 | 259 | ||
260 | ourShakeOptions :: ShakeOptions | ||
261 | ourShakeOptions = shakeOptions { | ||
262 | shakeFiles = "_build", | ||
263 | shakeColor = True, | ||
264 | shakeProgress = progressSimple | ||
265 | } | ||
266 | |||
260 | chrootImage :: FilePath -> [String] -> IO () | 267 | chrootImage :: FilePath -> [String] -> IO () |
261 | chrootImage target args = | 268 | chrootImage 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 | ||
286 | shakeBuildOneImage :: FilePath -> IO () | 293 | shakeBuildOneImage :: FilePath -> IO () |
287 | shakeBuildOneImage target = | 294 | shakeBuildOneImage 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 | ||