diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-22 20:24:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-22 20:24:53 -0400 |
| commit | 4d376b47b7aa506c4f4a4c5ccc83ca2ef1aeacc2 (patch) | |
| tree | 33ab2e7c4b72d8a7fce40a0e93f63f3d50a6c3ab /Utility | |
| parent | f672c39279366a8927abfcde3050952365f5e0ee (diff) | |
expose Control.Monad.join
I think I've been looking for that function for some time.
Ie, I remember wanting to collapse Just Nothing to Nothing.
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Lsof.hs | 2 | ||||
| -rw-r--r-- | Utility/Rsync.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Utility/Lsof.hs b/Utility/Lsof.hs index 8db514d79..31da6781e 100644 --- a/Utility/Lsof.hs +++ b/Utility/Lsof.hs @@ -32,7 +32,7 @@ setupLsof = do when (isAbsolute cmd) $ do path <- getSearchPath let path' = takeDirectory cmd : path - setEnv "PATH" (join [searchPathSeparator] path') True + setEnv "PATH" (intercalate [searchPathSeparator] path') True {- Checks each of the files in a directory to find open files. - Note that this will find hard links to files elsewhere that are open. -} diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index a36c6076f..d4eeddc8c 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -22,7 +22,7 @@ rsyncShell command = [Param "-e", Param $ unwords $ map escape (toCommand comman {- rsync requires some weird, non-shell like quoting in - here. A doubled single quote inside the single quoted - string is a single quote. -} - escape s = "'" ++ join "''" (split "'" s) ++ "'" + escape s = "'" ++ intercalate "''" (split "'" s) ++ "'" {- Runs rsync in server mode to send a file. -} rsyncServerSend :: [CommandParam] -> FilePath -> IO Bool |