Revert "Make file globbing work on windows."

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

View file

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

View file

@ -73,9 +73,6 @@ import Text.Pandoc.Readers.Txt2Tags (getT2TMeta)
import Paths_pandoc (getDataDir)
import Text.Printf (printf)
import Text.Pandoc.Error
#ifdef _WINDOWS
import System.FilePath.Glob (glob)
#endif
type Transform = Pandoc -> Pandoc
@ -1059,13 +1056,7 @@ main = do
-- thread option data structure through all supplied option 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
#endif
convertWithOpts :: Opt -> [FilePath] -> IO ()
convertWithOpts opts args = do