diff --git a/yesod/Scaffolding/CodeGen.hs b/yesod/Scaffolding/CodeGen.hs index de54d98f..7f834e78 100644 --- a/yesod/Scaffolding/CodeGen.hs +++ b/yesod/Scaffolding/CodeGen.hs @@ -14,7 +14,7 @@ data Token = VarToken String | LitToken String | EmptyToken codegenDir :: FilePath -> FilePath -> Q Exp codegenDir dir fp = do s' <- qRunIO $ L.readFile $ (dir ++ "/" ++ fp ++ ".cg") - let s = init $ LT.unpack $ LT.decodeUtf8 s' + let s = LT.unpack $ LT.decodeUtf8 s' case parse (many parseToken) s s of Left e -> error $ show e Right tokens' -> do 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") diff --git a/yesod/scaffold/.ghci.cg b/yesod/scaffold/.ghci.cg index 44fa6f76..76ae5677 100644 --- a/yesod/scaffold/.ghci.cg +++ b/yesod/scaffold/.ghci.cg @@ -1,2 +1 @@ :set -i.:config:dist/build/autogen - diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index fe326b94..07d0e342 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -61,4 +61,3 @@ getApplicationDev = loader = loadConfig (configSettings Development) { csParseExtra = parseExtra } - diff --git a/yesod/scaffold/LICENSE.cg b/yesod/scaffold/LICENSE.cg index 7830a89e..125c9165 100644 --- a/yesod/scaffold/LICENSE.cg +++ b/yesod/scaffold/LICENSE.cg @@ -23,4 +23,3 @@ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff --git a/yesod/scaffold/Model.hs.cg b/yesod/scaffold/Model.hs.cg index ed11b9d8..86bf5947 100644 --- a/yesod/scaffold/Model.hs.cg +++ b/yesod/scaffold/Model.hs.cg @@ -12,4 +12,3 @@ import Database.Persist.Quasi -- http://www.yesodweb.com/book/persistent/ share [mkPersist ~mkPersistSettings~, mkMigrate "migrateAll"] $(persistFileWith lowerCaseSettings "config/models") - diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg index 60884f3c..a8810dd0 100644 --- a/yesod/scaffold/Settings.hs.cg +++ b/yesod/scaffold/Settings.hs.cg @@ -68,4 +68,3 @@ parseExtra :: DefaultEnv -> Object -> Parser Extra parseExtra _ o = Extra <$> o .: "copyright" <*> o .:? "analytics" - diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg index 2ba792a6..e6048731 100644 --- a/yesod/scaffold/Settings/StaticFiles.hs.cg +++ b/yesod/scaffold/Settings/StaticFiles.hs.cg @@ -19,4 +19,3 @@ staticSite = -- Warning: any files added to your static directory during run-time can't be -- accessed this way. You'll have to use their FilePath or URL to access them. $(staticFiles Settings.staticDir) - diff --git a/yesod/scaffold/templates/default-layout.hamlet.cg b/yesod/scaffold/templates/default-layout.hamlet.cg index bef70857..0c10f18a 100644 --- a/yesod/scaffold/templates/default-layout.hamlet.cg +++ b/yesod/scaffold/templates/default-layout.hamlet.cg @@ -3,4 +3,3 @@ $maybe msg <- mmsg ^{widget}