diff --git a/CHANGELOG.md b/CHANGELOG.md index 16392c34..f770d1be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/dist/install-ocaml-unix.sh b/dist/install-ocaml-unix.sh index 99ec4254..6e27fb81 100755 --- a/dist/install-ocaml-unix.sh +++ b/dist/install-ocaml-unix.sh @@ -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 diff --git a/src/install-ocaml-unix.sh b/src/install-ocaml-unix.sh index 99ec4254..6e27fb81 100755 --- a/src/install-ocaml-unix.sh +++ b/src/install-ocaml-unix.sh @@ -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