From 53a54fcf034f27e0b2cdcadb2d37a9db95f136f5 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 31 Jan 2012 19:35:07 -0800 Subject: [PATCH] Restores prompts to not having a final newline Also, since "done" isn't a prompt, just uses putStr for that message. It's got an extra newline now, but imho that looks nicer anyway. --- yesod/Scaffolding/Scaffolder.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod/Scaffolding/Scaffolder.hs b/yesod/Scaffolding/Scaffolder.hs index 6e754fce..9e5d667a 100644 --- a/yesod/Scaffolding/Scaffolder.hs +++ b/yesod/Scaffolding/Scaffolder.hs @@ -36,7 +36,7 @@ data Backend = Sqlite | Postgresql | Mysql | MongoDB | Tiny deriving (Eq, Read, Show, Enum, Bounded) puts :: String -> IO () -puts s = putStr s >> hFlush stdout +puts s = putStr (init s) >> hFlush stdout backends :: [Backend] backends = [minBound .. maxBound] @@ -201,4 +201,4 @@ scaffold = do $(runIO (S.readFile "scaffold/config/robots.txt.cg") >>= \bs -> do [|S.pack $(return $ LitE $ StringL $ S.unpack bs)|]) - puts $(codegenDir "input" "done") + putStr $(codegenDir "input" "done")