Rename Windows.Cygwin.install_from_release to install_cygwin

Light internal refactoring.

Author: MisterDA

src-opam/opam.ml

@@ -433,7 +433,7 @@ let windows_opam2 ?win10_revision ?winget ?(labels = []) ?arch ~opam_hashes
     Windows.header ~alias:"opam-builder" ?win10_revision ~version ()
     @@ Windows.sanitize_reg_path ()
     @@ Windows.Cygwin.(
-         install_from_release
+         install_cygwin
            ~extra:
              ("git" :: "patch" :: "mingw64-x86_64-gcc-g++"
             :: "mingw64-i686-gcc-g++" :: mingw_packages)
@@ -456,7 +456,7 @@ let windows_opam2 ?win10_revision ?winget ?(labels = []) ?arch ~opam_hashes
       | _ -> invalid_arg "Invalid distribution"
     in
     let extra, pkgs = Windows.Cygwin.ocaml_for_windows_packages ~extra () in
-    Windows.Cygwin.install_from_release ~msvs_tools:true ~extra ()
+    Windows.Cygwin.install_cygwin ~msvs_tools:true ~extra ()
     @@ vs_build_tools @@ pkgs
   in
   winget_image @@ opams_image

src-opam/windows.ml

@@ -216,26 +216,25 @@ module Cygwin = struct
     env [ ("CYGWIN", "nodosfilewarning winsymlinks:native") ]
     @@ prepend_path (List.map (( ^ ) cyg.root) [ {|\bin|} ])
 
-  let install_from_release ?(cyg = default) ?(msvs_tools = false) ?(extra = [])
-      () =
+  let install_cygwin ?(cyg = default) ?(msvs_tools = false) ?(extra = []) () =
     setup_env ~cyg
     @@ add
          ~src:[ "https://www.cygwin.com/setup-x86_64.exe" ]
          ~dst:(cyg.root ^ {|\setup-x86_64.exe|})
          ()
     @@ install_cygsympathy_from_source cyg
-    @@ install ~cyg extra
+    @@ (if extra <> [] then install ~cyg extra else empty)
     @@ (if msvs_tools then install_msvs_tools_from_source cyg else empty)
     @@ run
          {|awk -i inplace "/(^#)|(^$)/{print;next}{$4=""noacl,""$4; print}" %s\etc\fstab|}
          cyg.root
 
   let setup ?(cyg = default) ?from () =
-    (match from with
-    | Some from ->
+    maybe
+      (fun from ->
         copy ~from ~src:[ default.root ] ~dst:default.root () @@ setup_env ~cyg
-        |> cleanup
-    | None -> empty)
+        |> cleanup)
+      from
     @@ workdir {|%s\home\opam|} cyg.root
 
   let cygwin_packages ?(flexdll_version = "0.39-1") () =
@@ -322,12 +321,12 @@ module Winget = struct
 
   let setup ?from () =
     let escape s = String.(concat {|""""|} (split_on_char '"' s)) in
-    (match from with
-    | Some from ->
+    maybe
+      (fun from ->
         copy ~from
           ~src:[ {|C:\Program Files\winget-cli|} ]
-          ~dst:{|C:\Program Files\winget-cli|} ()
-    | None -> empty)
+          ~dst:{|C:\Program Files\winget-cli|} ())
+      from
     @@ prepend_path [ {|C:\Program Files\winget-cli|} ]
     @@ run_powershell ~escape
          {|$path=(Join-Path $env:LOCALAPPDATA 'Packages\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe\LocalState'); New-Item $path -ItemType Directory -Force; '{ "$schema": "https://aka.ms/winget-settings.schema.json", "telemetry": { "disable": "true" } }' | Out-File -encoding ASCII (Join-Path $path 'settings.json')|}

src-opam/windows.mli

@@ -92,7 +92,7 @@ module Cygwin : sig
   val default : cyg
   (** The default Cygwin root, mirror, and arguments. *)
 
-  val install_from_release :
+  val install_cygwin :
     ?cyg:cyg -> ?msvs_tools:bool -> ?extra:string list -> unit -> Dockerfile.t
   (** Install Cygwin with CygSymPathy and optionally msvs-tools,
       and [extra] Cygwin packages (first in a separate Docker image).
@@ -101,7 +101,7 @@ module Cygwin : sig
       @see <https://github.com/metastack/msvs-tools> *)
 
   val setup : ?cyg:cyg -> ?from:string -> unit -> t
-  (** Setup winget, optionally copied from the [from] Docker image.  *)
+  (** Setup Cygwin workdir, optionally copied from the [from] Docker image. *)
 
   val install : ?cyg:cyg -> string list -> Dockerfile.t
   (** Install the supplied Cygwin package list. The packages should be
@@ -168,8 +168,8 @@ module Winget : sig
       image). The optional [winget_version] specifies a Git tag. *)
 
   val setup : ?from:string -> unit -> t
-  (** Setup winget, optionally copied from the [from] Docker
-      image. Disable winget telemetry. *)
+  (** Setup winget, optionally copied from the [from] Docker image. Disable
+      winget telemetry. *)
 
   val install : string list -> t
   (** [install packages] will install the supplied winget package list. *)