Merge ebef09bf3d into 28cd9be54e

Merge branch 'master' into pr
set/unset CONDA_PREFIX on activate
2025-11-08 11:33:55 -05:00 · 2024-09-25 20:09:26 -04:00 · 2022-10-14 17:23:37 +03:00 · 2019-03-05 11:22:13 -08:00
2 changed files with 3 additions and 1 deletions
--- a/bin/pyenv-sh-activate
+++ b/bin/pyenv-sh-activate
@@ -214,9 +214,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
--- a/bin/pyenv-sh-deactivate
+++ b/bin/pyenv-sh-deactivate
@@ -88,7 +88,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
Author	SHA1	Message	Date
Andrew Christianson	bc80c02184	Merge `ebef09bf3d` into `28cd9be54e`	2024-09-25 20:09:26 -04:00
Ivan Pozdeev	ebef09bf3d	Merge branch 'master' into pr	2022-10-14 17:23:37 +03:00
Andrew Christianson	a54be0cab2	set/unset CONDA_PREFIX on activate	2019-03-05 11:22:13 -08:00