sim command fixes

diff --git a/Command/Sim.hs b/Command/Sim.hs
index 76dd88af3b870e3ecabeb48a2c7af6124fbd70ee..a3e096ceff76e3bbebb6d47451d56b19768f06d8 100644 (file)
--- a/Command/Sim.hs
+++ b/Command/Sim.hs
@@ -27,8 +27,9 @@ seek :: CmdParams -> CommandSeek
 seek ("start":[]) = start Nothing
 seek ("start":simfile:[]) = start (Just simfile)
 seek ("end":[]) = do
-       simdir <- fromRepo gitAnnexSimDir
-       liftIO $ removeDirectoryRecursive $ fromRawFilePath simdir
+       simdir <- fromRawFilePath <$> fromRepo gitAnnexSimDir
+       whenM (liftIO $ doesDirectoryExist simdir) $ do
+               liftIO $ removeDirectoryRecursive simdir
 seek ("visit":reponame:[]) = do
        simdir <- fromRepo gitAnnexSimDir
        liftIO (restoreSim simdir) >>= \case
@@ -76,9 +77,10 @@ start simfile = do
                { simFile = Just simlogfile }
        case simfile of
                Nothing -> startup simdir st []
-               Just f -> case parseSimFile f of
-                       Left err -> giveup err
-                       Right cs -> startup simdir st cs
+               Just f -> liftIO (readFile f) >>= \c -> 
+                       case parseSimFile c of
+                               Left err -> giveup err
+                               Right cs -> startup simdir st cs
        showLongNote $ UnquotedString "Sim started, logging to sim file " 
                <> QuotedPath (toRawFilePath simlogfile)
   where