diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-20 18:14:20 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-20 23:24:05 -0400 |
| commit | 8e2f74f7ab188b72b1053140f28f1f4a6a792675 (patch) | |
| tree | 7dcbf90fb221987f3fbbd4f2ecaba7df7ed6842a | |
| parent | 815d1318d7a54836f65ba4b72703808959223bb2 (diff) | |
update
| -rw-r--r-- | Utility/Url.hs | 4 | ||||
| -rw-r--r-- | configure.hs | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Utility/Url.hs b/Utility/Url.hs index 7ce43d9bd..f215a1ebd 100644 --- a/Utility/Url.hs +++ b/Utility/Url.hs @@ -7,6 +7,7 @@ module Utility.Url ( exists, + canDownload, download, get ) where @@ -32,6 +33,9 @@ exists url = (2,_,_) -> return True _ -> return False +canDownload :: IO Bool +canDownload = (||) <$> inPath "wget" <*> inPath "curl" + {- Used to download large files, such as the contents of keys. - - Uses wget or curl program for its progress bar. (Wget has a better one, diff --git a/configure.hs b/configure.hs index 0d96b3955..bf25de507 100644 --- a/configure.hs +++ b/configure.hs @@ -19,6 +19,7 @@ tests = , TestCase "xargs -0" $ requireCmd "xargs_0" "xargs -0 </dev/null" , 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 "bup" $ testCmd "bup" "bup --version >/dev/null" , TestCase "gpg" $ testCmd "gpg" "gpg --version >/dev/null" ] ++ shaTestCases [1, 256, 512, 224, 384] |