From b98c882eca38ca166d9c40e87b827ed1ae67b46b Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev Date: Thu, 11 Dec 2025 17:30:08 +0300 Subject: [PATCH] rename, initialize PREFIX --- bin/pyenv-virtualenv-delete | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/bin/pyenv-virtualenv-delete b/bin/pyenv-virtualenv-delete index 1a8e4d6..1eb6981 100755 --- a/bin/pyenv-virtualenv-delete +++ b/bin/pyenv-virtualenv-delete @@ -55,25 +55,26 @@ case "$DEFINITION" in esac VERSION_NAME="${DEFINITION##*/}" +ENV_PREFIX="" COMPAT_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}" if [[ "${DEFINITION}" != "${DEFINITION%/envs/*}" ]]; then - PYENV_VE_PREFIX="${PYENV_ROOT}/versions/${DEFINITION}" + ENV_PREFIX="${PYENV_ROOT}/versions/${DEFINITION}" if [ -L "${COMPAT_PREFIX}" ]; then - if [[ "${PYENV_VE_PREFIX}" != "$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then + if [[ "${ENV_PREFIX}" != "$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" ]]; then unset COMPAT_PREFIX fi fi else if [ -L "${COMPAT_PREFIX}" ]; then - PYENV_VE_PREFIX="$(resolve_link "${COMPAT_PREFIX}" 2>/dev/null || true)" - if [[ "${PYENV_VE_PREFIX%/*/envs/*}" != "${PYENV_ROOT}/versions" ]]; then + ENV_PREFIX="$(resolve_link "${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 exit 1 fi else if pyenv-virtualenv-prefix "${VERSION_NAME}" 1>/dev/null 2>&1; then - PYENV_VE_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}" + ENV_PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}" unset COMPAT_PREFIX elif [ -z "$FORCE" ]; then echo "pyenv-virtualenv: \`${DEFINITION}' is not a virtualenv." 1>&2 @@ -83,20 +84,20 @@ else fi if [ -z "$FORCE" ]; then - if [ ! -d "$PYENV_VE_PREFIX" ]; then + if [ ! -d "$ENV_PREFIX" ]; then echo "pyenv-virtualenv: virtualenv \`$VERSION_NAME' not installed" >&2 exit 1 fi - read -p "pyenv-virtualenv: remove $PYENV_VE_PREFIX? (y/N) " + read -p "pyenv-virtualenv: remove $ENV_PREFIX? (y/N) " case "$REPLY" in y* | Y* ) ;; * ) exit 1 ;; esac fi -if [ -d "$PYENV_VE_PREFIX" ]; then - rm -rf "$PYENV_VE_PREFIX" +if [ -d "$ENV_PREFIX" ]; then + rm -rf "$ENV_PREFIX" if [ -L "$COMPAT_PREFIX" ]; then rm -rf "$COMPAT_PREFIX" fi