summaryrefslogtreecommitdiff
path: root/Command/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-03-03 17:07:27 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-03-03 17:07:27 -0400
commit3aa991bc7961433c0b888a2ab184b22942e5de79 (patch)
tree87d9649c8519d3d49b8128c9b343b14119db45f2 /Command/Assistant.hs
parent19a17dddb2baad5fbfa3203449ac416b30b8fa1b (diff)
webapp: New preferences page allows enabling/disabling debug logging at runtime, as well as configuring numcopies and diskreserve.
Diffstat (limited to 'Command/Assistant.hs')
-rw-r--r--Command/Assistant.hs26
1 files changed, 11 insertions, 15 deletions
diff --git a/Command/Assistant.hs b/Command/Assistant.hs
index ea8a87a3d..69a127b50 100644
--- a/Command/Assistant.hs
+++ b/Command/Assistant.hs
@@ -50,21 +50,17 @@ checkAutoStart = ifM (elem "--autostart" <$> getArgs)
autoStart :: IO ()
autoStart = do
- autostartfile <- autoStartFile
- let nothing = error $ "Nothing listed in " ++ autostartfile
- ifM (doesFileExist autostartfile)
- ( do
- dirs <- nub . lines <$> readFile autostartfile
- program <- readProgramFile
- when (null dirs) nothing
- forM_ dirs $ \d -> do
- putStrLn $ "git-annex autostart in " ++ d
- ifM (catchBoolIO $ go program d)
- ( putStrLn "ok"
- , putStrLn "failed"
- )
- , nothing
- )
+ dirs <- liftIO readAutoStartFile
+ when (null dirs) $ do
+ f <- autoStartFile
+ error $ "Nothing listed in " ++ f
+ program <- readProgramFile
+ forM_ dirs $ \d -> do
+ putStrLn $ "git-annex autostart in " ++ d
+ ifM (catchBoolIO $ go program d)
+ ( putStrLn "ok"
+ , putStrLn "failed"
+ )
where
go program dir = do
changeWorkingDirectory dir