github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

I should have used basename only to check shims

Browse source
This commit is contained in:
Yamashita, Yuu 2017-07-21 00:55:11 +00:00
parent 753a9e826b
commit e9ad498fe3
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pyenv.d/rehash/conda.bash
View file

@ -19,7 +19,7 @@ for shim in $(cat "${BASH_SOURCE%/*}/conda.d/"*".list" | sort | uniq | sed -e 's
fi fi
done done
shopt -u nullglob shopt -u nullglob
eval "conda_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}" eval "conda_shim(){ case \"\${1##*/}\" in ${shims[@]} *)return 1;;esac;}"
# override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash` # override `make_shims` to avoid conflict between pyenv-virtualenv's `envs.bash`
# https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash # https://github.com/pyenv/pyenv-virtualenv/blob/v20160716/etc/pyenv.d/rehash/envs.bash

2
pyenv.d/rehash/source.bash
View file

@ -8,7 +8,7 @@ for shim in $(cat "${BASH_SOURCE%/*}/source.d/"*".list" | sort | uniq | sed -e '
fi fi
done done
shopt -u nullglob shopt -u nullglob
eval "source_shim(){ case \"\$1\" in ${shims[@]} *)return 1;;esac;}" eval "source_shim(){ case \"\${1##*/}\" in ${shims[@]} *)return 1;;esac;}"
cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH cat > "${PROTOTYPE_SOURCE_SHIM_PATH}" <<SH
#!/usr/bin/env bash #!/usr/bin/env bash