summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
Diffstat (limited to 'Command')
-rw-r--r--Command/AddUrl.hs2
-rw-r--r--Command/InitRemote.hs2
-rw-r--r--Command/TransferKeys.hs2
-rw-r--r--Command/Version.hs6
4 files changed, 5 insertions, 7 deletions
diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index db003d4ef..c4062068a 100644
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -156,7 +156,7 @@ url2file url pathdepth = case pathdepth of
| otherwise -> error "bad --pathdepth"
where
fullurl = uriRegName auth ++ uriPath url ++ uriQuery url
- frombits a = join "/" $ a urlbits
+ frombits a = intercalate "/" $ a urlbits
urlbits = map (filesize . escape) $ filter (not . null) $ split "/" fullurl
auth = fromMaybe (error $ "bad url " ++ show url) $ uriAuthority url
filesize = take 255
diff --git a/Command/InitRemote.hs b/Command/InitRemote.hs
index c82dc9ddf..5d48e9715 100644
--- a/Command/InitRemote.hs
+++ b/Command/InitRemote.hs
@@ -31,7 +31,7 @@ start [] = do
error $ "Specify a name for the remote. " ++
if null names
then ""
- else "Either a new name, or one of these existing special remotes: " ++ join " " names
+ else "Either a new name, or one of these existing special remotes: " ++ intercalate " " names
start (name:ws) = do
(u, c) <- findByName name
let fullconfig = config `M.union` c
diff --git a/Command/TransferKeys.hs b/Command/TransferKeys.hs
index 9334fd08f..2f5ea1fe4 100644
--- a/Command/TransferKeys.hs
+++ b/Command/TransferKeys.hs
@@ -95,7 +95,7 @@ runRequests readh writeh a = do
sendRequest :: Transfer -> AssociatedFile -> Handle -> IO ()
sendRequest t f h = do
- hPutStr h $ join fieldSep
+ hPutStr h $ intercalate fieldSep
[ serialize (transferDirection t)
, serialize (transferUUID t)
, serialize (transferKey t)
diff --git a/Command/Version.hs b/Command/Version.hs
index 9d2399b86..549d89028 100644
--- a/Command/Version.hs
+++ b/Command/Version.hs
@@ -27,12 +27,10 @@ start = do
showPackageVersion
putStrLn $ "local repository version: " ++ fromMaybe "unknown" v
putStrLn $ "default repository version: " ++ defaultVersion
- putStrLn $ "supported repository versions: " ++ vs supportedVersions
- putStrLn $ "upgrade supported from repository versions: " ++ vs upgradableVersions
+ putStrLn $ "supported repository versions: " ++ unwords supportedVersions
+ putStrLn $ "upgrade supported from repository versions: " ++ unwords upgradableVersions
putStrLn $ "build flags: " ++ unwords buildFlags
stop
- where
- vs = join " "
showPackageVersion :: IO ()
showPackageVersion = putStrLn $ "git-annex version: " ++ SysConfig.packageversion