Commit f19d292
committed
Fix detection of conda executable.
Previously the (which conda) was returning, on macos, some garbage shell function or alias, leading to this mess:
JULIA_CONDAPKG_BACKEND=Null
JULIA_CONDAPKG_EXE=conda () {
\local cmd="${1-__missing__}"
case "$cmd" in
(activate | deactivate) __conda_activate "$@" ;;
eturn (install | update | upgrade | remove | uninstall) __conda_exe "$@" ||
__conda_activate reactivate ;;
(*) __conda_exe "$@" ;;
esac
}
JULIA_PYTHONCALL_EXE=/Users/rwest/miniconda3/envs/rmg_env15/bin/python
PYTHON_JULIAPKG_EXE=/Users/rwest/.juliaup/bin/julia
PYTHON_JULIAPKG_PROJECT=/Users/rwest/miniconda3/envs/rmg_env15/julia_env
which totally messed up the conda environment, making it impossible to activate.
This method now finds the actual conda excutable.1 parent 85ede7d commit f19d292
1 file changed
Lines changed: 4 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
99 | 99 | | |
100 | 100 | | |
101 | 101 | | |
| 102 | + | |
| 103 | + | |
102 | 104 | | |
103 | | - | |
| 105 | + | |
104 | 106 | | |
105 | 107 | | |
106 | 108 | | |
107 | 109 | | |
108 | 110 | | |
109 | | - | |
| 111 | + | |
110 | 112 | | |
111 | 113 | | |
112 | 114 | | |
| |||
0 commit comments