From a3fd6c674d233f949f070ff10c131f3713b78b4e Mon Sep 17 00:00:00 2001 From: Albert Krewinkel Date: Tue, 27 Sep 2022 11:49:29 +0200 Subject: pandoc-cli: update to hslua-cli-1.2 --- pandoc-cli/pandoc-cli.cabal | 2 +- pandoc-cli/src/pandoc.hs | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'pandoc-cli') diff --git a/pandoc-cli/pandoc-cli.cabal b/pandoc-cli/pandoc-cli.cabal index a7734bd55..f7f65ba7e 100644 --- a/pandoc-cli/pandoc-cli.cabal +++ b/pandoc-cli/pandoc-cli.cabal @@ -59,7 +59,7 @@ executable pandoc main-is: pandoc.hs buildable: True build-depends: pandoc, - hslua-cli >= 1.1 && < 1.2 + hslua-cli >= 1.2 && < 1.3 other-modules: PandocCLI.Server if flag(server) build-depends: pandoc-server >= 0.1 && < 0.2, diff --git a/pandoc-cli/src/pandoc.hs b/pandoc-cli/src/pandoc.hs index 4564aa619..ca39b316f 100644 --- a/pandoc-cli/src/pandoc.hs +++ b/pandoc-cli/src/pandoc.hs @@ -39,9 +39,11 @@ main = E.handle (handleError . Left) $ do -- | Runs pandoc as a Lua interpreter that is (mostly) compatible with -- the default @lua@ program shipping with Lua. runLuaInterpreter :: String -> [String] -> IO () -runLuaInterpreter _progName _args = do +runLuaInterpreter progName args = do let settings = Settings { settingsVersionInfo = "\nEmbedded in pandoc " <> pandocVersion - , settingsRunner = handleError <=< runIOorExplode . runLua + , settingsRunner = runner } - runStandalone settings + runStandalone settings progName args + where + runner _envBehavior = handleError <=< runIOorExplode . runLua -- cgit v1.2.3