Skip to content

Commit 9d404fa

Browse files
authored
Merge pull request #59 from psafont/setswitch
unix: activate the switch unconditinally
2 parents 21e931f + b878124 commit 9d404fa

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ and this project adheres to
1717
`setup-x86_64.exe`).
1818
- The Windows runner no longer prepends `%CYGWIN_ROOT%\bin` to `PATH`.
1919

20+
### Fixed
21+
22+
- Switches in Unix are now properly initialized before running depext.
23+
2024
## [1.1.7]
2125

2226
### Changed

dist/install-ocaml-unix.sh

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/install-ocaml-unix.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,7 @@ CURRENT_OCAML=$(opam info -f version ocaml --color=never)
99

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

0 commit comments

Comments
 (0)