activate: look for a conda environment if given name is not a pyenv's prefix

This commit is contained in:
Yamashita, Yuu
2015-07-19 03:38:48 +09:00
parent be6701e7b6
commit 25395f0331
3 changed files with 34 additions and 10 deletions

View File

@@ -62,10 +62,19 @@ if [ "${#versions[@]}" -gt 1 ]; then
exit 1
fi
if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
[ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
echo "false"
exit 1
if pyenv-prefix "${versions}" 1>/dev/null 2>&1; then
if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
[ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not a virtualenv" 1>&2
echo "false"
exit 1
fi
else
versions="$(pyenv-version-name)/envs/${versions}"
if ! pyenv-virtualenv-prefix "${versions}" 1>/dev/null 2>&1; then
[ -n "$NOERROR" ] || echo "pyenv-virtualenv: version \`${versions}' is not an environment of anaconda/miniconda" 1>&2
echo "false"
exit 1
fi
fi
shell="${PYENV_SHELL:-${SHELL##*/}}"