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.

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

Jump to bottom

opam env: fix carriage return on Cygwin shell #5715

Merged
merged 3 commits into from
Jan 11, 2024
Merged

opam env: fix carriage return on Cygwin shell #5715

merged 3 commits into from
Jan 11, 2024

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Nov 2, 2023

fix #5684

@rjbou rjbou added the KIND: BUG label Nov 2, 2023
@kit-ty-kate kit-ty-kate added this to For RC in Opam 2.2.0 Nov 2, 2023
kit-ty-kate
kit-ty-kate reviewed Nov 2, 2023
View reviewed changes
src/core/opamConsole.ml Outdated Show resolved Hide resolved
@rjbou rjbou moved this from For RC to For beta1 in Opam 2.2.0 Nov 13, 2023
@kit-ty-kate kit-ty-kate mentioned this pull request Nov 15, 2023
Closed
emillon
emillon reviewed Nov 20, 2023
View reviewed changes
master_changes.md Outdated Show resolved Hide resolved
@rjbou rjbou removed the request for review from dra27 November 21, 2023 17:44
@rjbou rjbou added this to the 2.2.0~beta1 milestone Nov 21, 2023
@rjbou rjbou mentioned this pull request Nov 27, 2023
Merged
rjbou
rjbou commented Nov 28, 2023
View reviewed changes
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
dra27
dra27 reviewed Nov 29, 2023
View reviewed changes
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
kit-ty-kate
kit-ty-kate reviewed Dec 19, 2023
View reviewed changes
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

@kit-ty-kate kit-ty-kate force-pushed the env-cr-win branch 3 times, most recently from da86aa3 to d3877c8 Compare January 8, 2024 14:07
@kit-ty-kate kit-ty-kate marked this pull request as draft January 8, 2024 16:56
@kit-ty-kate kit-ty-kate marked this pull request as ready for review January 9, 2024 00:52
@kit-ty-kate kit-ty-kate requested a review from dra27 January 9, 2024 16:05
dra27 and others added 3 commits January 10, 2024 21:25
@dra27
Remove stray comments from pwsh and cmd env
5ba2981 
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.
@dra27
Don't print CR for Unix shell lines in opam env
e9408c3 
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
Update master_changes.md
8449bad
@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
Opam 2.2.0 automation moved this from For beta1 to Done Jan 11, 2024
@dra27 dra27 mentioned this pull request Jun 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emillon emillon emillon left review comments

@kit-ty-kate kit-ty-kate kit-ty-kate approved these changes

@dra27 dra27 Awaiting requested review from dra27

Assignees
No one assigned
Labels
AREA: PORTABILITY KIND: BUG PR: WAITING FOR REVIEW
Projects
No open projects
Opam 2.2.0
  
Done
Milestone
2.2.0~beta1
Development

Successfully merging this pull request may close these issues.

opam.2.2~alpha2 env error on Windows 10 / 11
4 participants
@rjbou @kit-ty-kate @emillon @dra27