unify elipsis handling

And add a simple dots-based progress display, currently only used in v2
upgrade.
This commit is contained in:
Joey Hess 2011-07-19 14:07:23 -04:00
parent ec9e9343d9
commit 00153eed48
22 changed files with 76 additions and 62 deletions

View file

@ -106,7 +106,7 @@ checkKey key = do
checkKey' :: [URLString] -> Annex Bool
checkKey' [] = return False
checkKey' (u:us) = do
showNote ("checking " ++ u)
showAction $ "checking " ++ u
e <- liftIO $ urlexists u
if e then return e else checkKey' us
@ -129,6 +129,6 @@ urlexists url =
download :: [URLString] -> FilePath -> Annex Bool
download [] _ = return False
download (url:us) file = do
showProgress -- make way for curl progress bar
showOutput -- make way for curl progress bar
ok <- liftIO $ boolSystem "curl" [Params "-L -C - -# -o", File file, File url]
if ok then return ok else download us file