Skip to content

Commit 291c276

Browse files
authored
Merge pull request #6190 from dra27/shadow-install
Env: Add install.exe to the shadow program list
2 parents 26f7462 + dfca6b0 commit 291c276

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

master_changes.md

+1
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ users)
8888

8989
## Env
9090
* Make the shell environment update hint easier to copy/paste [#6159 @kit-ty-kate - fix #6158]
91+
* 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]
9192

9293
## Opamfile
9394
* Make all writes atomic [#5489 @kit-ty-kate]

src/state/opamEnv.ml

+3-1
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,9 @@ let rezip_to_string ?insert z =
307307
join_var (rezip ?insert z)
308308

309309
let cygwin_non_shadowed_programs =
310-
["bash.exe"; "make.exe"; "sort.exe"; "tar.exe"]
310+
[ "bash.exe"; "make.exe"; "sort.exe"; "tar.exe";
311+
"install.exe"; (* from Vim for Windows *)
312+
]
311313

312314
let apply_op_zip ~sepfmt var op arg (rl1,l2 as zip) =
313315
let arg = transform_format ~sepfmt var arg in

0 commit comments

Comments
 (0)