From 95418cc430284b65af13105f7c63da08908dd826 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Tue, 16 Dec 2014 14:04:40 -0400
Subject: Use wget -q --show-progress for less verbose wget output, when built
 with wget 1.16.

---
 Utility/Url.hs | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'Utility/Url.hs')

diff --git a/Utility/Url.hs b/Utility/Url.hs
index cb950b824..cc15c82d0 100644
--- a/Utility/Url.hs
+++ b/Utility/Url.hs
@@ -191,9 +191,18 @@ download' quiet url file uo =
 	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. -}
+	 - support, or need that option.
+	 -
+	 - When the wget version is new enough, pass options for
+	 - a less cluttered download display.
+	 -}
 #ifndef __ANDROID__
-	wgetparams = [Params "--clobber -c -O"]
+	wgetparams = catMaybes
+		[ if Build.SysConfig.wgetquietprogress
+			then Just $ Params "-q --show-progress"
+			else Nothing
+		, Just $ Params "--clobber -c -O"
+		]
 #else
 	wgetparams = [Params "-c -O"]
 #endif
-- 
cgit v1.2.3