Merge pull request #6304 from kit-ty-kate/curl-macos

Make curl the default download tool instead of wget on macOS
ocaml · Nov 18, 2024 · 3a11680 · 3a11680
2 parents d45aa58 + 16a2019
commit 3a11680
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -115,6 +115,7 @@ users)
 ## Shell
 
 ## Internal
+  * Make `curl` the default download tool instead of `wget` on macOS [#6304 @kit-ty-kate]
 
 ## Internal: Windows
 

diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml
@@ -96,6 +96,7 @@ let req_dl_tools () =
   let msg =
     Some "A download tool is required, check env variables OPAMCURL or OPAMFETCH"
   in
+  (* Keep synchronised with [OpamRepositoryConfig.default] *)
   let default =
     [
       ["curl"; "wget"], msg, Some not_open_free_bsd_filter;

diff --git a/src/repository/opamRepositoryConfig.ml b/src/repository/opamRepositoryConfig.ml
@@ -53,14 +53,14 @@ type 'a options_fun =
   'a
 
 let default = {
+  (* Keep synchronised with [OpamInitDefaults.req_dl_tools] *)
   download_tool = lazy (
     let os = OpamStd.Sys.os () in
     try
       let curl = "curl", `Curl in
       let tools =
         match os with
-        | Darwin  -> ["wget", `Default; curl]
-        | FreeBSD -> ["fetch", `Default ; curl]
+        | FreeBSD -> ["fetch", `Default; curl]
         | OpenBSD -> ["ftp", `Default; curl]
         | _ -> [curl; "wget", `Default]
       in