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

Use canonical name for VIRTUAL_ENV as a workaround for IPython (fixes #113)

Browse Source
This commit is contained in:
Yamashita, Yuu
2015-11-12 00:28:44 +00:00
parent 25bf4a6155
commit a73817eecc
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pyenv-sh-activate
View File

@@ -14,6 +14,10 @@
set -e set -e
[ -n "$PYENV_DEBUG" ] && set -x [ -n "$PYENV_DEBUG" ] && set -x
resolve_link() {
$(type -p greadlink readlink | head -1) "$1"
}
unset FORCE unset FORCE
unset QUIET unset QUIET
unset VERBOSE unset VERBOSE
@@ -86,6 +90,10 @@ done
shell="${PYENV_SHELL:-${SHELL##*/}}" shell="${PYENV_SHELL:-${SHELL##*/}}"
prefix="$(pyenv-prefix "${venv}")" prefix="$(pyenv-prefix "${venv}")"
if [ -L "${prefix}" ]; then
prefix="$(resolve_link "${prefix}" 2>/dev/null)"
fi
if [[ "${VIRTUAL_ENV}" == "${prefix}" ]]; then if [[ "${VIRTUAL_ENV}" == "${prefix}" ]]; then
if [ -z "${QUIET}" ]; then if [ -z "${QUIET}" ]; then
echo "pyenv-virtualenv: version \`${venv}' is already activated" 1>&2 echo "pyenv-virtualenv: version \`${venv}' is already activated" 1>&2