Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Revert "Make file globbing work on windows."

Browse source 
This reverts commit 363ecfebc3.
This commit is contained in:
John MacFarlane 2016-01-06 11:11:59 -08:00
parent 363ecfebc3
commit 197f301795
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandoc.cabal
View file

@ -300,8 +300,7 @@ Library
Build-Tools: hsb2hs >= 0.3.1 Build-Tools: hsb2hs >= 0.3.1
other-modules: Text.Pandoc.Data other-modules: Text.Pandoc.Data
if os(windows) if os(windows)
Cpp-options: -D_WINDOWS Cpp-options: -D_WINDOWS
Build-depends: Glob >= 0.7 && < 0.8
Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
Ghc-Prof-Options: -fprof-auto-exported -rtsopts Ghc-Prof-Options: -fprof-auto-exported -rtsopts
Default-Language: Haskell98 Default-Language: Haskell98

9
pandoc.hs
View file

@ -73,9 +73,6 @@ import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
import Paths_pandoc (getDataDir) import Paths_pandoc (getDataDir)
import Text.Printf (printf) import Text.Printf (printf)
import Text.Pandoc.Error import Text.Pandoc.Error
#ifdef _WINDOWS
import System.FilePath.Glob (glob)
#endif
type Transform = Pandoc -> Pandoc type Transform = Pandoc -> Pandoc
@ -1059,13 +1056,7 @@ main = do
-- thread option data structure through all supplied option actions -- thread option data structure through all supplied option actions
opts <- foldl (>>=) (return defaultOpts) actions opts <- foldl (>>=) (return defaultOpts) actions
-- on windows we need to do our own file globbing, since the shell doesn't.
#ifdef _WINDOWS
mapM glob args >>= convertWithOpts opts . concat
#else
convertWithOpts opts args convertWithOpts opts args
#endif
convertWithOpts :: Opt -> [FilePath] -> IO () convertWithOpts :: Opt -> [FilePath] -> IO ()
convertWithOpts opts args = do convertWithOpts opts args = do