m/pyenv-virtualenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv-virtualenv.git synced 2025-11-11 13:03:52 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge ebef09bf3d into aa9b8e9a5a

Browse Source
This commit is contained in:
Andrew Christianson
2025-01-24 05:04:01 +00:00
committed by GitHub
parent aa9b8e9a5a ebef09bf3d
commit a657fd7162
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pyenv-sh-activate
View File

@@ -214,9 +214,11 @@ if [ -d "${prefix}/conda-meta" ] ||
case "${shell}" in case "${shell}" in
fish ) fish )
echo "set -gx CONDA_DEFAULT_ENV \"${CONDA_DEFAULT_ENV}\";" 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_DEFAULT_ENV=\"${CONDA_DEFAULT_ENV}\";"
echo "export CONDA_PREFIX=\"${prefix}\";"
;; ;;
esac esac
fi fi

2
bin/pyenv-sh-deactivate
View File

@@ -88,7 +88,7 @@ if [ -d "${prefix}/conda-meta" ] ||
shopt -s nullglob shopt -s nullglob
case "${shell}" in case "${shell}" in
fish ) fish )
: # conda doesn't support fish echo "set -e CONDA_PREFIX"
;; ;;
* ) * )
for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do for script in "${prefix}/etc/conda/deactivate.d"/*.sh; do