summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2017-02-20 15:14:56 -0400
committerJoey Hess <joeyh@joeyh.name>2017-02-20 15:25:02 -0400
commit4a397b53131d8769623f82bf8e740745cc85b644 (patch)
tree3f71c8bbc7393dba175fc3b577b6a8b2865a99dc /Build
parent3488679a813157466deafa0a40fcc4af97ddece4 (diff)
Run wget with -nv instead of -q, so it will display HTTP errors.
This adds one extra line of output when a download is successful, after the progress bar. I don't much like that, but wget does not provide a way to show HTTP errors without it.
Diffstat (limited to 'Build')
-rw-r--r--Build/Configure.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Build/Configure.hs b/Build/Configure.hs
index 616dcc57d6..7c7c2efe03 100644
--- a/Build/Configure.hs
+++ b/Build/Configure.hs
@@ -34,7 +34,7 @@ tests =
, TestCase "rsync" $ requireCmd "rsync" "rsync --version >/dev/null"
, TestCase "curl" $ testCmd "curl" "curl --version >/dev/null"
, TestCase "wget" $ testCmd "wget" "wget --version >/dev/null"
- , TestCase "wget supports -q --show-progress" checkWgetQuietProgress
+ , TestCase "wget unclutter options" checkWgetUnclutter
, TestCase "bup" $ testCmd "bup" "bup --version >/dev/null"
, TestCase "nice" $ testCmd "nice" "nice true >/dev/null"
, TestCase "ionice" $ testCmd "ionice" "ionice -c3 true >/dev/null"
@@ -105,8 +105,8 @@ getGitVersion = go =<< getEnv "FORCE_GIT_VERSION"
error $ "installed git version " ++ show v ++ " is too old! (Need " ++ show oldestallowed ++ " or newer)"
return $ Config "gitversion" $ StringConfig $ show v
-checkWgetQuietProgress :: Test
-checkWgetQuietProgress = Config "wgetquietprogress" . BoolConfig
+checkWgetUnclutter :: Test
+checkWgetUnclutter = Config "wgetunclutter" . BoolConfig
. maybe False (>= normalize "1.16")
<$> getWgetVersion