mirror of
https://github.com/pyenv/pyenv-virtualenv.git
synced 2026-09-10 23:36:20 -04:00
Source conda package activate/deactivat scripts if exist (fixes #173)
This commit is contained in:
parent
98bb240843
commit
d6bc583753
|
|
@ -231,3 +231,19 @@ EOS
|
|||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# conda package anaconda/miniconda scripts (#173)
|
||||
if [ -x "${prefix}/bin/conda" ]; then
|
||||
shopt -s nullglob
|
||||
case "${shell}" in
|
||||
fish )
|
||||
: # conda doesn't support fish
|
||||
;;
|
||||
* )
|
||||
for script in "${prefix}/etc/conda/activate.d"/*.sh; do
|
||||
echo ". \"${script}\";"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
shopt -u nullglob
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -58,6 +58,22 @@ if [ -n "$PYENV_VIRTUALENV_VERBOSE_ACTIVATE" ]; then
|
|||
echo "pyenv-virtualenv: deactivate ${venv}" 1>&2
|
||||
fi
|
||||
|
||||
# conda package anaconda/miniconda scripts (#173)
|
||||
if [ -x "${prefix}/bin/conda" ]; then
|
||||
shopt -s nullglob
|
||||
case "${shell}" in
|
||||
fish )
|
||||
: # conda doesn't support fish
|
||||
;;
|
||||
* )
|
||||
for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
|
||||
echo ". \"${script}\";"
|
||||
done
|
||||
;;
|
||||
esac
|
||||
shopt -u nullglob
|
||||
fi
|
||||
|
||||
if [ -n "${PYENV_ACTIVATE_SHELL}" ]; then
|
||||
# shell version set in pyenv-sh-activate should be unset
|
||||
# https://github.com/yyuu/pyenv-virtualenv/issues/61
|
||||
|
|
|
|||
Loading…
Reference in a new issue