factor: update download to return path and using lists

[factor.git] / basis / bootstrap / image / download / download.factor

diff --git a/basis/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor
index 739b968f356fe240fe3ff9b825bec498cc368e7d..6f440b973225c07d1c20bf5d9f2eb021ae62d69e 100644 (file)
--- a/basis/bootstrap/image/download/download.factor
+++ b/basis/bootstrap/image/download/download.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2008, 2010 Slava Pestov.
 ! See https://factorcode.org/license.txt for BSD license.
 USING: assocs bootstrap.image checksums checksums.md5
-http.client io.files kernel math.parser splitting urls ;
+http.client http.download io.files kernel math.parser splitting
+urls ;
 IN: bootstrap.image.download
 
 CONSTANT: download-url URL" https://downloads.factorcode.org/images/master/"
@@ -26,9 +27,8 @@ CONSTANT: download-url URL" https://downloads.factorcode.org/images/master/"
     need-new-image? [ "Boot image corrupt" throw ] when ;
 
 : download-image ( image -- )
-    [ download-url swap >url derive-url download ]
-    [ verify-image ]
-    bi ;
+    [ download-url ] dip >url derive-url
+    download verify-image ;
 
 : maybe-download-image ( image -- ? )
     dup need-new-image? [ download-image t ] [ drop f ] if ;