hesh 1.3.0 → 1.4.0

raw patch · 3 files changed

+14/−8 lines, 3 filesdep ~hesh

Dependency ranges changed: hesh

Files

• hesh.cabal +2/−2
• hesh/Main.hs +11/−5
• lib/Hesh/Process.hs +1/−1

@@ -1,5 +1,5 @@ name:                hesh-version:             1.3.0+version:             1.4.0 synopsis:            the Haskell Extensible Shell: Haskell for Bash-style scripts description:         Hesh makes writing scripts in Haskell easier by providing Bash-style syntax for running commands, implicit module imports, and automatic dependency inference and Cabal file generation. It allows shebang execution of scripts. homepage:            https://github.com/jekor/hesh@@ -32,7 +32,7 @@                        filepath,                        hackage-db >= 1.8,                        haskell-src-exts,-                       hesh == 1.3.0,+                       hesh == 1.4.0,                        parsec >= 3,                        process,                        text,

@@ -121,7 +121,7 @@ importDeclUnqualified m = ImportDecl (SrcLoc "<generated>" 0 0) (ModuleName m) False False False Nothing Nothing Nothing  packageFromModules modules (m, _, Just pkg)-  | pkg == "hesh" = Cartel.package "hesh" Cartel.anyVersion -- [1, 3, 0] [1, 3, 0]+  | pkg == "hesh" = Cartel.package "hesh" Cartel.anyVersion -- [1, 4, 0] [1, 4, 0]   | otherwise = Cartel.package pkg Cartel.anyVersion packageFromModules modules (m, _, Nothing)   | m == "Hesh" || isPrefixOf "Hesh." m = Cartel.package "hesh" Cartel.anyVersion@@ -129,9 +129,9 @@  main = run (term, termInfo) -term = hesh <$> flagStdin <*> flagNoSugar <*> optionFile <*> arguments+term = hesh <$> flagStdin <*> flagNoSugar <*> flagCompileOnly <*> optionFile <*> arguments -termInfo = defTI { termName = "hesh", version = "1.3.0" }+termInfo = defTI { termName = "hesh", version = "1.4.0" }  flagStdin :: Term Bool flagStdin = value . flag $ (optInfo [ "stdin", "s" ]) { optName = "STDIN", optDoc = "If this option is present, or if no arguments remain after option processing, then the script is read from standard input." }@@ -139,12 +139,15 @@ flagNoSugar :: Term Bool flagNoSugar = value . flag $ (optInfo [ "no-sugar", "n" ]) { optName = "NOSUGAR", optDoc = "Don't expand syntax shortcuts." } +flagCompileOnly :: Term Bool+flagCompileOnly = value . flag $ (optInfo [ "compile-only", "c" ]) { optName = "COMPILEONLY", optDoc = "Compile the script but don't run it." }+ optionFile :: Term String optionFile = value (pos 0 "" posInfo { posName = "FILE" })  arguments = value (posAny [] posInfo { posName = "ARGS" }) -hesh useStdin noSugar _ args' = do+hesh useStdin noSugar compileOnly _ args' = do   -- In order to work in shebang mode and to provide a more familiar   -- commandline interface, we support taking the input filename as an   -- argument (rather than just relying on the script being provided@@ -221,7 +224,10 @@   -- Finally, run the script.   -- Should we exec() here?   -- TODO: Set the program name appropriately.-  callCommand (dir </> "dist/build" </> scriptName </> scriptName) args+  let path = dir </> "dist/build" </> scriptName </> scriptName+  if compileOnly+    then putStr path+    else callCommand path args  where fqNameModule name = (name, Nothing, Nothing)        sugarPragmas = [LanguagePragma (SrcLoc "<generated>" 0 0) [Ident "TemplateHaskell", Ident "QuasiQuotes", Ident "PackageImports"]] 

@@ -11,7 +11,7 @@ import qualified Data.Text as Text import qualified Data.Text.IO as Text.IO import System.Exit (ExitCode(..))-import System.IO (openFile, IOMode(..), hGetContents, hClose, hPutStrLn, stderr)+import System.IO (Handle, openFile, IOMode(..), hGetContents, hClose, hPutStrLn, stderr) import System.Process (proc, createProcess, CreateProcess(..), ProcessHandle, waitForProcess, StdStream(..), CmdSpec(..), readProcess)  pipeOps = ["|>", "/>", "!>", "&>", "</", "/>>", "!>>", "&>>"]