github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-12-22 04:02:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add workaround for conflict of rehash hook between pyenv-virtualenv

Browse source
This commit is contained in:
Yamashita, Yuu 2016-07-26 07:47:02 +00:00
parent e93ae00ca1
commit ac07d63780
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pyenv.d/rehash/anaconda.bash
View file

@ -53,6 +53,18 @@ conda_shim() {
return 1
}
# override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
# https://github.com/yyuu/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash
make_shims() {
local file shim
for file do
shim="${file##*/}"
if ! conda_shim "${shim}" 1>&2; then
register_shim "$shim"
fi
done
}
deregister_conda_shims() {
local shim
local shims=()
@ -61,7 +73,7 @@ deregister_conda_shims() {
shims[${#shims[*]}]="${shim}"
fi
done
registered_shims="${shims[@]}"
registered_shims=" ${shims[@]} "
}
if conda_exists; then