From 45c39a20a4ded47f0775c113b50735326558cf17 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 13 Jan 2014 14:52:49 -0400 Subject: Android: Avoid passing --clobber to busybox wget. --- Utility/Url.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'Utility') diff --git a/Utility/Url.hs b/Utility/Url.hs index 03c311fd2..2cbab77c8 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -125,7 +125,15 @@ download' quiet url headers options file ua = _ -> return False where headerparams = map (\h -> Param $ "--header=" ++ h) headers - wget = go "wget" $ headerparams ++ quietopt "-q" ++ [Params "--clobber -c -O"] + wget = go "wget" $ headerparams ++ quietopt "-q" ++ wgetparams + {- Regular wget needs --clobber to continue downloading an existing + - file. On Android, busybox wget is used, which does not + - support, or need that option. -} +#ifndef __ANDROID__ + wgetparams = [Params "--clobber -c -O"] +#else + wgetparams = [Params "-c -O"] +#endif {- Uses the -# progress display, because the normal - one is very confusing when resuming, showing - the remainder to download as the whole file, -- cgit v1.2.3