diff options
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Rsync.hs | 2 | ||||
| -rw-r--r-- | Utility/SafeCommand.hs | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index 08caeb12b..f8e19eb57 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -53,7 +53,7 @@ rsync = boolSystem "rsync" - The params must enable rsync's --progress mode for this to work. -} rsyncProgress :: (Integer -> IO ()) -> [CommandParam] -> IO Bool -rsyncProgress callback params = catchBoolIO $ +rsyncProgress callback params = withHandle StdoutHandle createProcessSuccess p (feedprogress 0 []) where p = proc "rsync" (toCommand params) diff --git a/Utility/SafeCommand.hs b/Utility/SafeCommand.hs index 19dd707b8..fbea7b6b2 100644 --- a/Utility/SafeCommand.hs +++ b/Utility/SafeCommand.hs @@ -49,8 +49,6 @@ boolSystemEnv command params environ = dispatch <$> safeSystemEnv command params safeSystem :: FilePath -> [CommandParam] -> IO ExitCode safeSystem command params = safeSystemEnv command params Nothing -{- Unlike many implementations of system, SIGINT(ctrl-c) is allowed - - to propigate and will terminate the program. -} safeSystemEnv :: FilePath -> [CommandParam] -> Maybe [(String, String)] -> IO ExitCode safeSystemEnv command params environ = do (_, _, _, pid) <- createProcess (proc command $ toCommand params) |