Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions bin/pyenv-sh-activate
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,11 @@ if [ -d "${prefix}/conda-meta" ] ||
case "${shell}" in
fish )
echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";"
echo "set -gx CONDA_PREFIX \"${prefix}\";"
;;
* )
echo "export CONDA_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
echo "export CONDA_PREFIX=\"${prefix}\";"
;;
esac
fi
Expand Down
2 changes: 1 addition & 1 deletion bin/pyenv-sh-deactivate
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ if [ -d "${prefix}/conda-meta" ] ||
shopt -s nullglob
case "${shell}" in
fish )
: # conda doesn't support fish
echo "set -e CONDA_PREFIX"
;;
* )
for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do
Expand Down