Globs for psc-bundle

paf31 · paf31 · commit fadbc285c57c · 2015-06-29T16:31:34.000-07:00
diff --git a/psc-bundle/Main.hs b/psc-bundle/Main.hs
@@ -36,6 +36,7 @@ import Control.Monad.Trans.Except
 import Control.Monad.IO.Class
 
 import System.FilePath (takeFileName, takeDirectory)
+import System.FilePath.Glob (glob)
 import System.Exit (exitFailure)
 import System.IO (stderr, hPutStrLn)
 import System.Directory (createDirectoryIfMissing)
@@ -533,7 +534,11 @@ codeGen Options{..} ms = renderToString (NN (JSSourceElementsTop (prelude ++ con
 -- and generates and prints the final Javascript bundle.
 app :: forall m. (Applicative m, MonadError ErrorMessage m, MonadIO m) => Options -> m String
 app opts@Options{..} = do
-  input <- for optionsInputFiles $ \filename -> do
+  inputFiles <- concat <$> mapM (liftIO . glob) optionsInputFiles
+  when (null inputFiles) . liftIO $ do
+    hPutStrLn stderr "psc: No input files."
+    exitFailure
+  input <- for inputFiles $ \filename -> do
     js <- liftIO (readFile filename)
     ast <- fromRight (parse js filename)
     mid <- guessModuleIdentifier filename
diff --git a/purescript.cabal b/purescript.cabal
@@ -224,7 +224,8 @@ executable psc-bundle
                        mtl -any,
                        transformers -any,
                        transformers-compat -any, 
-                       optparse-applicative >= 0.10.0
+                       optparse-applicative >= 0.10.0,
+                       Glob -any
   ghc-options:         -Wall -O2
   hs-source-dirs:      psc-bundle
   default-language:    Haskell2010
