yesod-bin 1.6.0.5 → 1.6.0.6

raw patch · 3 files changed

+15/−2 lines, 3 files

Files

• AddHandler.hs +10/−1
• ChangeLog.md +4/−0
• yesod-bin.cabal +1/−1

@@ -84,13 +84,22 @@     methods <- getLine     addHandlerFiles cabal routePair pattern methods +getRoutesFilePath :: IO FilePath+getRoutesFilePath = do+    let oldPath = "config/routes"+    oldExists <- doesFileExist oldPath+    pure $ if oldExists+        then oldPath+        else "config/routes.yesodroutes"+ addHandlerFiles :: FilePath -> (String, FilePath) -> String -> String -> IO () addHandlerFiles cabal (name, handlerFile) pattern methods = do     src <- getSrcDir cabal     let applicationFile = concat [src, "/Application.hs"]     modify applicationFile $ fixApp name     modify cabal $ fixCabal name-    modify "config/routes" $ fixRoutes name pattern methods+    routesPath <- getRoutesFilePath+    modify routesPath $ fixRoutes name pattern methods     writeFile handlerFile $ mkHandler name pattern methods     specExists <- doesFileExist specFile     unless specExists $

@@ -1,5 +1,9 @@ # ChangeLog for yesod-bin +## 1.6.0.6++Fix the `add-handler` subcommand to support both the old default routes filename (`routes`) and the new one (`routes.yesodroutes`) [#1688](https://github.com/yesodweb/yesod/pull/1688)+ ## 1.6.0.5  * Use process groups to ensure GHC is killed on Ctrl-C [#1683](https://github.com/yesodweb/yesod/pull/1683)

@@ -1,5 +1,5 @@ name:            yesod-bin-version:         1.6.0.5+version:         1.6.0.6 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>