054e6ab · typeable/pandoc

git.iko.soy/typeable/pandoc

Revert "New method for checking for presence of tex program."

This reverts commit 285bbf61cf2b21278792e48aee7c25fa0ee62faa.

commit054e6abd0da453ffca04ed443e60d059506ad0eb authorJohn MacFarlane <jgm@berkeley.edu> dateThu 12 May 2016, 21:01 (10 years ago) parent5d8d8b0

2 files changed+3−8

unifiedsplit

pandoc.cabal+1−2

@@ -425,8 +425,7 @@ Executable pandoc

425425 aeson >= 0.7.0.5 && < 0.12,

426426 yaml >= 0.8.8.2 && < 0.9,

427427 containers >= 0.1 && < 0.6,

428− HTTP >= 4000.0.5 && < 4000.4,

429− process >= 1.0 && < 1.5

428+ HTTP >= 4000.0.5 && < 4000.4

430429 if flag(network-uri)

431430 Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6

432431 else

pandoc.hs+2−6

@@ -52,7 +52,6 @@ import Data.Char ( toLower, toUpper )

5252import Data.List ( delete, intercalate, isPrefixOf, isSuffixOf, sort )

5353import System.Directory ( getAppUserDataDirectory, findExecutable,

5454 doesFileExist, Permissions(..), getPermissions )

55−import System.Process ( readProcessWithExitCode )

5655import System.IO ( stdout, stderr )

5756import System.IO.Error ( isDoesNotExistError )

5857import qualified Control.Exception as E

@@ -1402,11 +1401,8 @@ convertWithOpts opts args = do

14021401 _ | html5Output -> "wkhtmltopdf"

14031402 _ -> latexEngine

14041403 -- check for pdf creating program

1405− (ec,_,_) <- E.catch

1406− (readProcessWithExitCode pdfprog ["--version"] "")

1407− (\(_ :: E.SomeException) ->

1408− return (ExitFailure 1,"",""))

1409− when (ec /= ExitSuccess) $

1404+ mbPdfProg <- findExecutable pdfprog

1405+ when (isNothing mbPdfProg) $

14101406 err 41 $ pdfprog ++ " not found. " ++

14111407 pdfprog ++ " is needed for pdf output."

14121408