mirror of
https://github.com/pyenv/pyenv-virtualenv.git
synced 2026-09-10 07:16:18 -04:00
rename, fix not bailing out with -f if venv is detected missing
This commit is contained in:
parent
b98c882eca
commit
5f6b9dfbc3
|
|
@ -55,27 +55,28 @@ case "$DEFINITION" in
|
|||
esac
|
||||
|
||||
VERSION_NAME="${DEFINITION##*/}"
|
||||
ENV_PREFIX=""
|
||||
COMPAT_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
|
||||
# Must initialize because it might be set in the environment
|
||||
ENV_PREFIX=
|
||||
ENV_COMPAT_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
|
||||
|
||||
if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then
|
||||
ENV_PREFIX="${PYENV_ROOT}/versions/${DEFINITION}"
|
||||
if [ -L "${COMPAT_PREFIX}" ]; then
|
||||
if [[ "${ENV_PREFIX}" != "$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then
|
||||
unset COMPAT_PREFIX
|
||||
if [ -L "${ENV_COMPAT_PREFIX}" ]; then
|
||||
if [[ "${ENV_PREFIX}" != "$(resolve_link "${ENV_COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then
|
||||
unset ENV_COMPAT_PREFIX
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if [ -L "${COMPAT_PREFIX}" ]; then
|
||||
ENV_PREFIX="$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)"
|
||||
if [ -L "${ENV_COMPAT_PREFIX}" ]; then
|
||||
ENV_PREFIX="$(resolve_link "${ENV_COMPAT_PREFIX}" 2>/dev/null || true)"
|
||||
if [[ "${ENV_PREFIX%/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then
|
||||
echo "pyenv-virtualenv: \`${COMPAT_PREFIX}' is a symlink for unknown location." 1>&2
|
||||
echo "pyenv-virtualenv: \`${ENV_COMPAT_PREFIX}' is a symlink for unknown location." 1>&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then
|
||||
ENV_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
|
||||
unset COMPAT_PREFIX
|
||||
unset ENV_COMPAT_PREFIX
|
||||
elif [ -z "$FORCE" ]; then
|
||||
echo "pyenv-virtualenv: \`${DEFINITION}' is not a virtualenv." 1>&2
|
||||
exit 1
|
||||
|
|
@ -83,12 +84,15 @@ else
|
|||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$FORCE" ]; then
|
||||
if [ ! -d "$ENV_PREFIX" ]; then
|
||||
if [ ! -d "$ENV_PREFIX" ]; then
|
||||
if [ -z "$FORCE" ]; then
|
||||
echo "pyenv-virtualenv: virtualenv \`$VERSION_NAME' not installed" >&2
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [ -z "$FORCE" ]; then
|
||||
read -p "pyenv-virtualenv: remove $ENV_PREFIX? (y/N) "
|
||||
case "$REPLY" in
|
||||
y* | Y* ) ;;
|
||||
|
|
@ -96,10 +100,8 @@ if [ -z "$FORCE" ]; then
|
|||
esac
|
||||
fi
|
||||
|
||||
if [ -d "$ENV_PREFIX" ]; then
|
||||
rm -rf "$ENV_PREFIX"
|
||||
if [ -L "$COMPAT_PREFIX" ]; then
|
||||
rm -rf "$COMPAT_PREFIX"
|
||||
fi
|
||||
pyenv-rehash
|
||||
rm -rf "$ENV_PREFIX"
|
||||
if [ -L "$ENV_COMPAT_PREFIX" ]; then
|
||||
rm -rf "$ENV_COMPAT_PREFIX"
|
||||
fi
|
||||
pyenv-rehash
|
||||
|
|
|
|||
Loading…
Reference in a new issue