From: John Benediktsson <mrjbq7@gmail.com>
Date: Fri, 21 Jan 2022 23:38:46 +0000 (-0800)
Subject: build: update to https for downloads.factorcode.org
X-Git-Tag: 0.99~1717
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=46c20e3f98624a115d5995058c8a219ac8c04b72

build: update to https for downloads.factorcode.org
---

diff --git a/README.md b/README.md
index 85574debaf..79a1b3f370 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ build script:
 * M1 macOS: `arch -x86_64 ./build.sh update`
 
 or download the correct boot image for your system from
-http://downloads.factorcode.org/images/master/, put it in the `factor`
+https://downloads.factorcode.org/images/master/, put it in the `factor`
 directory and run:
 
 * Unix: `make` and then `./factor -i=boot.unix-x86.64.image`
diff --git a/basis/bootstrap/image/download/download.factor b/basis/bootstrap/image/download/download.factor
index 39fc4ddd95..ef555d217b 100644
--- a/basis/bootstrap/image/download/download.factor
+++ b/basis/bootstrap/image/download/download.factor
@@ -4,10 +4,10 @@ USING: assocs bootstrap.image checksums checksums.md5
 http.client io.files kernel math.parser splitting urls ;
 IN: bootstrap.image.download
 
-CONSTANT: url URL" http://downloads.factorcode.org/images/master/"
+CONSTANT: download-url URL" https://downloads.factorcode.org/images/master/"
 
 : download-checksums ( -- alist )
-    url "checksums.txt" >url derive-url http-get nip
+    download-url "checksums.txt" >url derive-url http-get nip
     split-lines [ " " split1 ] { } map>assoc ;
 
 : file-checksum ( image -- checksum )
@@ -26,7 +26,7 @@ CONSTANT: url URL" http://downloads.factorcode.org/images/master/"
     need-new-image? [ "Boot image corrupt" throw ] when ;
 
 : download-image ( image -- )
-    [ url swap >url derive-url download ]
+    [ download-url swap >url derive-url download ]
     [ verify-image ]
     bi ;
 
diff --git a/build.cmd b/build.cmd
index 85466486b5..49d56dc1c6 100644
--- a/build.cmd
+++ b/build.cmd
@@ -80,7 +80,7 @@ if "%_compile_vm%"=="1" (
     if errorlevel 1 goto fail
 )
 
-set _bootimage_url=http://downloads.factorcode.org/images/%GIT_BRANCH%/%_bootimage%
+set _bootimage_url=https://downloads.factorcode.org/images/%GIT_BRANCH%/%_bootimage%
 if "%_bootimage_type%"=="download" (
     echo Fetching %GIT_BRANCH% boot image...
     echo URL: %_bootimage_url%
diff --git a/extra/webapps/mason/package/package.factor b/extra/webapps/mason/package/package.factor
index d12d1464de..39ae1fd2f0 100644
--- a/extra/webapps/mason/package/package.factor
+++ b/extra/webapps/mason/package/package.factor
@@ -44,7 +44,7 @@ IN: webapps.mason.package
     packages-url dup link ;
 
 : clean-image-url ( builder -- url )
-    platform "http://downloads.factorcode.org/images/clean/" prepend ;
+    platform "https://downloads.factorcode.org/images/clean/" prepend ;
 
 : clean-image-link ( builder -- link )
     clean-image-url dup link ;
diff --git a/extra/zealot/factor/factor.factor b/extra/zealot/factor/factor.factor
index bec454bbb7..fcc0853384 100644
--- a/extra/zealot/factor/factor.factor
+++ b/extra/zealot/factor/factor.factor
@@ -11,10 +11,10 @@ vocabs.metadata zealot ;
 IN: zealot.factor
 
 : download-boot-checksums ( path branch -- )
-    '[ _ "http://downloads.factorcode.org/images/%s/checksums.txt" sprintf download ] with-directory ;
+    '[ _ "https://downloads.factorcode.org/images/%s/checksums.txt" sprintf download ] with-directory ;
 
 : download-boot-image ( path branch image-name -- )
-    '[ _ _ "http://downloads.factorcode.org/images/%s/%s" sprintf download ] with-directory ;
+    '[ _ _ "https://downloads.factorcode.org/images/%s/%s" sprintf download ] with-directory ;
 
 : download-my-boot-image ( path branch -- )
     my-boot-image-name download-boot-image ;
@@ -211,4 +211,4 @@ M: windows factor-path "./factor.com" ;
         changed-factor-vocabs-from-master
     ] [
         changed-factor-vocabs-from-clean
-    ] if reject-unloadable-vocabs ;
\ No newline at end of file
+    ] if reject-unloadable-vocabs ;