summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-04-22 01:20:17 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-04-22 01:20:17 -0400
commit42e4145a170a12f557fbe58344bb115061452d2a (patch)
treeecdfd74740bdbdd87d062f73ad50def9ec491df5
parentf8fc79cf58fa8c3acf9948a162a81850ffbbccb5 (diff)
bugfixes
-rw-r--r--Config.hs4
-rw-r--r--Utility/Url.hs4
2 files changed, 4 insertions, 4 deletions
diff --git a/Config.hs b/Config.hs
index 065ee48f3..3feb246e5 100644
--- a/Config.hs
+++ b/Config.hs
@@ -101,7 +101,7 @@ getDiskReserve = fromMaybe megabyte . readSize dataUnits
- splitting it into lines. -}
getHttpHeaders :: Annex [String]
getHttpHeaders = do
- cmd <- getConfig "annex.httpheaders-command" ""
+ cmd <- getConfig "annex.http-headers-command" ""
if (null cmd)
- then fromRepo $ Git.Config.getList "annex.httpheaders"
+ then fromRepo $ Git.Config.getList "annex.http-headers"
else lines . snd <$> liftIO (pipeFrom "sh" ["-c", cmd])
diff --git a/Utility/Url.hs b/Utility/Url.hs
index 465ef855c..b75229e1b 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -57,13 +57,13 @@ download :: URLString -> Headers -> [CommandParam] -> FilePath -> IO Bool
download url headers options file = ifM (inPath "wget") (wget , curl)
where
headerparams = map (\h -> Param $ "--header=" ++ h) headers
- wget = go "wget" $ Params "-c -O" : headerparams
+ wget = go "wget" $ headerparams ++ [Params "-c -O"]
{- Uses the -# progress display, because the normal
- one is very confusing when resuming, showing
- the remainder to download as the whole file,
- and not indicating how much percent was
- downloaded before the resume. -}
- curl = go "curl" $ Params "-L -C - -# -o" : headerparams
+ curl = go "curl" $ headerparams ++ [Params "-L -C - -# -o"]
go cmd opts = boolSystem cmd $
options++opts++[File file, File url]