Skip to content

Env: Add install.exe to the shadow program list #6190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 4, 2024
Merged

Env: Add install.exe to the shadow program list #6190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 3 additions & 1 deletion src/state/opamEnv.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading