Merge pull request ocaml#6190 from dra27/shadow-install

Env: Add install.exe to the shadow program list
dra27 · Sep 4, 2024 · 291c276 · 291c276
2 parents 26f7462 + dfca6b0
commit 291c276
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/master_changes.md b/master_changes.md
@@ -88,6 +88,7 @@ users)
 
 ## Env
   * Make the shell environment update hint easier to copy/paste [#6159 @kit-ty-kate - fix #6158]
+  * Add install.exe to the list of non-shadowed programs when adding Cygwin's bin directory to PATH (ocamlfind et al can be affected by Vim for Windows) [#6190 @dra27]
 
 ## Opamfile
   * Make all writes atomic [#5489 @kit-ty-kate]

diff --git a/src/state/opamEnv.ml b/src/state/opamEnv.ml
@@ -307,7 +307,9 @@ let rezip_to_string ?insert z =
   join_var (rezip ?insert z)
 
 let cygwin_non_shadowed_programs =
-  ["bash.exe"; "make.exe"; "sort.exe"; "tar.exe"]
+  [ "bash.exe"; "make.exe"; "sort.exe"; "tar.exe";
+    "install.exe"; (* from Vim for Windows *)
+  ]
 
 let apply_op_zip ~sepfmt var op arg (rl1,l2 as zip) =
   let arg = transform_format ~sepfmt var arg in