Skip to content
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.

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

opam env: fix carriage return on Cygwin shell #5715

Merged
merged 3 commits into from
Jan 11, 2024

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Nov 2, 2023

fix #5684

src/core/opamConsole.ml Outdated Show resolved Hide resolved
master_changes.md Outdated Show resolved Hide resolved
src/stubs/win32/opamWindows.c Outdated Show resolved Hide resolved
@rjbou rjbou changed the title opam env: fix carriage return on Cygwin opam env: fix carriage return on Cygwin shell Nov 28, 2023
@rjbou rjbou added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Nov 28, 2023
Copy link
Member

@dra27 dra27 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Possible C simplification

src/stubs/win32/opamWindows.c Outdated Show resolved Hide resolved
src/stubs/win32/opamWindows.c Outdated Show resolved Hide resolved
@rjbou
Copy link
Collaborator Author

rjbou commented Dec 11, 2023

Updated @kit-ty-kate !

@rjbou rjbou added PR: WAITING FOR REVIEW and removed PR: QUEUED Pending pull request, waiting for other work to be merged or closed labels Dec 11, 2023
src/core/dune Outdated Show resolved Hide resolved
@rjbou
Copy link
Collaborator Author

rjbou commented Jan 2, 2024

todo : Update with cloning file descriptors instead of mutex

dra27 and others added 3 commits January 10, 2024 21:25
opam env -v includes comments indicating where the packages come from.
In sh-compatible outputs, the colon operator is used. This was
erroneously used for both cmd and pwsh, neither of which support it.
When the output of opam env is not to a console, the output needs to be
literal for shells and not CRLF-translated on Windows.
@kit-ty-kate
Copy link
Member

Thanks!

@kit-ty-kate kit-ty-kate merged commit 71631ca into ocaml:master Jan 11, 2024
29 checks passed
@dra27 dra27 mentioned this pull request Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

opam.2.2~alpha2 env error on Windows 10 / 11
4 participants