diff --git a/yesod-bin/ChangeLog.md b/yesod-bin/ChangeLog.md index a50d1200..33bd9f04 100644 --- a/yesod-bin/ChangeLog.md +++ b/yesod-bin/ChangeLog.md @@ -1,3 +1,7 @@ +## 1.4.18.2 + +* Work around change in behavior in newer optparse-applicative ([mailing list discussion](https://groups.google.com/d/msg/yesodweb/BrTkMKFREgU/AKVc9AK2AQAJ)) + ## 1.4.18.1 * error handling when checking for stack binary [#1219](https://github.com/yesodweb/yesod/pull/1219) diff --git a/yesod-bin/main.hs b/yesod-bin/main.hs index f81afff3..90d72149 100755 --- a/yesod-bin/main.hs +++ b/yesod-bin/main.hs @@ -174,24 +174,24 @@ optParser :: Parser Options optParser = Options <$> flag Cabal CabalDev ( long "dev" <> short 'd' <> help "use cabal-dev" ) <*> switch ( long "verbose" <> short 'v' <> help "More verbose output" ) - <*> subparser ( command "init" (info initOptions + <*> subparser ( command "init" (info (helper <*> initOptions) (progDesc "Command no longer available, please use 'stack new'")) <> command "hsfiles" (info (pure HsFiles) (progDesc "Create a hsfiles file for the current folder")) <> command "configure" (info (pure Configure) (progDesc "Configure a project for building")) - <> command "build" (info (Build <$> extraCabalArgs) + <> command "build" (info (helper <*> (Build <$> extraCabalArgs)) (progDesc $ "Build project (performs TH dependency analysis)" ++ windowsWarning)) <> command "touch" (info (pure Touch) (progDesc $ "Touch any files with altered TH dependencies but do not build" ++ windowsWarning)) - <> command "devel" (info develOptions + <> command "devel" (info (helper <*> develOptions) (progDesc "Run project with the devel server")) <> command "test" (info (pure Test) (progDesc "Build and run the integration tests")) - <> command "add-handler" (info addHandlerOptions + <> command "add-handler" (info (helper <*> addHandlerOptions) (progDesc ("Add a new handler and module to the project." ++ " Interactively asks for input if you do not specify arguments."))) - <> command "keter" (info keterOptions + <> command "keter" (info (helper <*> keterOptions) (progDesc "Build a keter bundle")) <> command "version" (info (pure Version) (progDesc "Print the version of Yesod")) diff --git a/yesod-bin/yesod-bin.cabal b/yesod-bin/yesod-bin.cabal index 1f864a73..bf8ef4f3 100644 --- a/yesod-bin/yesod-bin.cabal +++ b/yesod-bin/yesod-bin.cabal @@ -1,5 +1,5 @@ name: yesod-bin -version: 1.4.18.1 +version: 1.4.18.2 license: MIT license-file: LICENSE author: Michael Snoyman