hsshellscript 3.6.1 → 3.6.2
raw patch · 6 files changed
+17/−15 lines, 6 filesdep ~base
Dependency ranges changed: base
Files
- hsshellscript.cabal +1/−2
- src/HsShellScript.hs +2/−1
- src/HsShellScript/Misc.chs +1/−1
- src/HsShellScript/Paths.hs +6/−5
- src/HsShellScript/ProcErr.chs +6/−5
- src/HsShellScript/Shell.hs +1/−1
hsshellscript.cabal view
@@ -20,7 +20,7 @@ -- PVP summary: +-+------- breaking API changes -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change-version: 3.6.1+version: 3.6.2 -- A short (one-line) description of the package. synopsis: Using Haskell for Unix shell scripting tasks@@ -83,7 +83,6 @@ ScopedTypeVariables, NamedFieldPuns, StandaloneDeriving--- Build-depends: base ^>= 4.13.0.0, Build-depends: base >= 4.13.0 && < 4.14, directory >= 1.3.6 && < 1.4, unix >= 2.7.2 && < 2.8,
src/HsShellScript.hs view
@@ -4,7 +4,8 @@ module HsShellScript.Args, -- * Paths and Directories- mkdir, rmdir, pwd, cd, realpath, realpath_s, path_exists, path_exists', is_file, is_dir, with_wd,+ mkdir, rmdir, pwd, cd, realpath, realpath_s,+ path_exists, path_exists', is_file, is_dir, with_wd, -- ** Parsing and Composing Paths module HsShellScript.Paths,
src/HsShellScript/Misc.chs view
@@ -486,7 +486,7 @@ -- -- You can't use @quote@ or @shell_quote@. ----- See 'glob', 'quote', 'shell_quote'+-- See 'glob', 'HsShellScript.Shell.quote', 'HsShellScript.Shell.shell_quote' glob_quote :: String -> String glob_quote path =
src/HsShellScript/Paths.hs view
@@ -6,11 +6,12 @@ import Data.List import System.Directory + {- | Split a path in components. Repeated \"@\/@\" characters don\'t lead to empty components. \"@.@\" path components are removed. If the path is absolute, the first component will start with \"@\/@\". \"@..@\" components are left intact. They can't be simply removed, because the preceding component might be a symlink. In this case,-'realpath' is probably what you need.+'HsShellScript.Commands.realpath' is probably what you need. The case that the path is empty is treated like \"@.@\", yielding an empty path components list. @@ -22,7 +23,7 @@ >slice_path "." = [] >slice_path "" = [] -See 'unslice_path', 'realpath', 'realpath_s'.+See 'unslice_path', 'HsShellScript.Commands.realpath', 'HsShellScript.Commands.realpath_s'. -} slice_path :: String -- ^ The path to be broken to components. -> [String] -- ^ List of path components.@@ -61,8 +62,8 @@ Note that the normalised path isn't 100% equivalent to the original one. Any trailing slash is removed. When the last path component is a symbolic link, then both paths denote the same thing, except for in the context of the-'readlink' call. It will fail when the trailing slash is present (because then the path denotes the directory which-the link points to), but it will succeed when it is absent.+'HsShellScript.Commands.readlink' call. It will fail when the trailing slash is present (because then the path+denotes the directory which the link points to), but it will succeed when it is absent. >normalise_path = unslice_path . slice_path @@ -86,7 +87,7 @@ Concateneting the name components and adding dots, reproduces the original name, with a normalised path:-@concat . intersperse \".\" . 'slice_filename' == 'normalise'@.+@concat . intersperse \".\" . 'slice_filename' == 'HsShellScript.Commands.normalise'@. Note that the last path component might be \"@..@\". Then it is not possible to deduce the refered directory's name from the path. An IO
src/HsShellScript/ProcErr.chs view
@@ -1151,7 +1151,7 @@ -- > -- > putStrLn res ----- See 'exec', 'pipe_to', 'pipe_from2', 'h_pipe_from', 'lazy_pipe_from', 'chomp', 'silently'.+-- See 'exec', 'pipe_to', 'pipe_from2', 'h_pipe_from', 'lazy_pipe_from', 'HsShellScript.Misc.chomp', 'silently'. pipe_from :: IO a -- ^ Action to run as a separate process. Its -- return value is ignored. -> IO String -- ^ The action's standard output@@ -1291,7 +1291,7 @@ -- -- >(h,pid) <- h_pipe_from $ exec "/usr/bin/foo" ["bar"] ----- See 'exec', 'pipe_to', 'h_pipe_from2', 'pipe_from', 'lazy_pipe_from', 'chomp', 'silently'.+-- See 'exec', 'pipe_to', 'h_pipe_from2', 'pipe_from', 'lazy_pipe_from', 'HsShellScript.Misc.chomp', 'silently'. -- See "HsShellScript#fdpipes" for more details. h_pipe_from :: IO a -- ^ Action to run as a separate process, and to pipe from -> IO (Handle, ProcessID) -- ^ Returns handle connected to the standard output of the child@@ -1345,7 +1345,7 @@ -- >(h,pid) <- h_pipe_from $ exec "/usr/bin/foo" ["bar"] -- -- See 'exec', 'pipe_from', 'pipe_from2', 'h_pipe_from', 'pipe_to',--- 'lazy_pipe_from', 'chomp', 'silently'.+-- 'lazy_pipe_from', 'HsShellScript.Misc.chomp', 'silently'. h_pipe_from2 :: IO a -- ^ Action to run as a separate process, and to pipe from -> IO (Handle, ProcessID) -- ^ Returns handle connected to the standard output of the child -- process, and the child's process ID@@ -1593,7 +1593,7 @@ -- -- This is a frontend to the 'h_pipe_from' function. See there for more details. ----- See 'pipe_from_full2', 'exec', 'pipe_to', 'pipe_from', 'h_pipe_from', 'lazy_pipe_from', 'chomp'.+-- See 'pipe_from_full2', 'exec', 'pipe_to', 'pipe_from', 'h_pipe_from', 'lazy_pipe_from', 'HsShellScript.Misc.chomp'. pipe_from_full :: IO a -- ^ Action to run as a separate process. Its return value is ignored.@@ -1620,7 +1620,8 @@ -- -- This is a frontend to the 'h_pipe_from2' function. See there for more details. ----- See 'pipe_from_full', 'exec', 'pipe_to', 'pipe_from', 'h_pipe_from', 'lazy_pipe_from', 'chomp'.+-- See 'pipe_from_full', 'exec', 'pipe_to', 'pipe_from', 'h_pipe_from', 'lazy_pipe_from',+-- 'HsShellScript.Misc.chomp'. pipe_from_full2 :: IO a -- ^ Action to run as a separate process. Its return value is ignored.
src/HsShellScript/Shell.hs view
@@ -34,7 +34,7 @@ -- from the bash source code. Bash in turn, implements POSIX 1003.2. So the -- result produced should be correct. From the bash info pages: -- \"... the rules for evaluation and quoting are taken from the POSIX--- 1003.2 specification for the `standard' Unix shell.\"+-- 1003.2 specification for the standard Unix shell.\" -- -- Note: The quoted strings are correctly recognized in shell scripts. But the shell bash has an annoying history -- expansion \"feature\", which causes it to choke on exclamation marks, when in interactive mode, even when quoted