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

Source conda 4.4.4 shell files

Browse Source 
Conda 4.4.4 (https://github.com/conda/conda/releases/tag/4.4.0)
made some changes on how to set up conda in the shell.
This commit addresses these.

This fixes some of the discussion in #178.
This commit is contained in:
Teake Nutma
2018-03-08 10:08:53 +01:00
parent 5419dc7320
commit 393bcc36b8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/pyenv-sh-activate
View File

@@ -237,7 +237,10 @@ if [ -x "${prefix}/bin/conda" ]; then
shopt -s nullglob shopt -s nullglob
case "${shell}" in case "${shell}" in
fish ) fish )
: # conda doesn't support fish # conda 4.4 and above
for script in "${prefix}/etc/fish/conf.d"/*.fish; do
echo "source \"${script}\";"
done
;; ;;
* ) * )
CONDA_PREFIX="$prefix" CONDA_PREFIX="$prefix"
@@ -245,6 +248,10 @@ if [ -x "${prefix}/bin/conda" ]; then
for script in "${prefix}/etc/conda/activate.d"/*.sh; do for script in "${prefix}/etc/conda/activate.d"/*.sh; do
echo ". \"${script}\";" echo ". \"${script}\";"
done done
# conda 4.4 and above
for script in "${prefix}/etc/profile.d"/*.sh; do
echo ". \"${script}\";"
done
;; ;;
esac esac
shopt -u nullglob shopt -u nullglob