From fb73b5c27b8b4e9ef171dc5665f11b8856a53117 Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sat, 20 Jul 2019 12:59:34 -0700 Subject: Revert "PDF: create temp dir in . on Cygwin." This reverts commit 50885eabde6e9ba524d74a234154766f4c522627. Reopens #5451. The problem with the previous commit is that it would lead to spurious messages on stderr on platforms like macOS. --- src/Text/Pandoc/PDF.hs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src') diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs index 2a8842e97..5826f9856 100644 --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -42,7 +42,6 @@ import Text.Pandoc.Error (PandocError (PandocPDFProgramNotFoundError)) import Text.Pandoc.MIME (getMimeType) import Text.Pandoc.Options (HTMLMathMethod (..), WriterOptions (..)) import Text.Pandoc.Process (pipeProcess) -import System.Process (readProcess) import Text.Pandoc.Shared (inDirectory, stringify) import qualified Text.Pandoc.UTF8 as UTF8 import Text.Pandoc.Walk (walkM) @@ -90,9 +89,7 @@ makePDF program pdfargs writer opts doc = -- user names (see #777) let withTempDir templ action = do tmp <- getTemporaryDirectory - uname <- E.catch (readProcess "uname" ["-o"] "") - (\(_ :: E.SomeException) -> return "") - if '~' `elem` tmp || uname == "Cygwin" -- see #5451 + if '~' `elem` tmp then withTempDirectory "." templ action else withSystemTempDirectory templ action (newCommonState, res) <- liftIO $ withTempDir "tex2pdf." $ \tmpdir' -> do -- cgit v1.2.3