Revert "shims: handle symlinked scripts, via new PYENV_FILE_ARG"

This reverts commit 493f036928.

# Conflicts:
#	libexec/pyenv
This commit is contained in:
Ivan Pozdeev 2021-02-16 23:53:05 +03:00
parent e44490c639
commit a6b0a2846e
2 changed files with 1 additions and 19 deletions

View file

@ -61,24 +61,6 @@ else
fi
export PYENV_ROOT
# Transfer PYENV_FILE_ARG (from shims) into PYENV_DIR.
if [ -z "${PYENV_DIR}" ]; then
if [ -n "${PYENV_FILE_ARG}" ]; then
if [ -L "${PYENV_FILE_ARG}" ]; then
PYENV_DIR="$(abs_dirname "${PYENV_FILE_ARG}")"
else
PYENV_DIR="${PYENV_FILE_ARG%/*}"
fi
export PYENV_DIR
unset PYENV_FILE_ARG
fi
else
[[ $PYENV_DIR == /* ]] || PYENV_DIR="$PWD/$PYENV_DIR"
cd "$PYENV_DIR" 2>/dev/null || abort "cannot change working directory to \`$PYENV_DIR'"
PYENV_DIR="$PWD"
cd "$OLDPWD"
fi
if [ -z "${PYENV_DIR}" ]; then
PYENV_DIR="$PWD"
fi

View file

@ -73,7 +73,7 @@ if [[ "\$program" = "python"* ]]; then
-c* | -- ) break ;;
*/* )
if [ -f "\$arg" ]; then
export PYENV_FILE_ARG="\$arg"
export PYENV_DIR="\${arg%/*}"
break
fi
;;