Skip to content

unix: activate the switch unconditinally #59

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
Feb 16, 2021
Merged

unix: activate the switch unconditinally #59

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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ and this project adheres to
`setup-x86_64.exe`).
- The Windows runner no longer prepends `%CYGWIN_ROOT%\bin` to `PATH`.

### Fixed

- Switches in Unix are now properly initialized before running depext.

## [1.1.7]

### Changed
Expand Down
3 changes: 3 additions & 0 deletions dist/install-ocaml-unix.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions src/install-ocaml-unix.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,7 @@ CURRENT_OCAML=$(opam info -f version ocaml --color=never)

if [ "$CURRENT_OCAML" != "$1" ]; then
opam switch set "$1" 2>/dev/null || opam switch create "$1" "$1"
else
# opam has been initialized with --bare, the switch needs to be activated
opam switch set "$1" 2>/dev/null
fi