bugfixes
This commit is contained in:
parent
f8fc79cf58
commit
42e4145a17
2 changed files with 4 additions and 4 deletions
|
@ -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])
|
||||
|
|
|
@ -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]
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue