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

fixed broken reference for "${PYTHON_BIN}"

Browse Source
This commit is contained in:
Yamashita Yuu
2013-06-18 14:54:11 +09:00
parent a4de1d7e89
commit f78a393864
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pyenv-virtualenv
View File

@@ -145,7 +145,6 @@ UPGRADE_PATH="${TMP}/pyenv-virtualenv.${SEED}"
UPGRADE_LIST="${TMP}/pyenv-virtualenv.${SEED}.txt" UPGRADE_LIST="${TMP}/pyenv-virtualenv.${SEED}.txt"
VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}" VIRTUALENV_PATH="${PYENV_ROOT}/versions/${VIRTUALENV_NAME}"
VIRTUALENV_PYTHON_BIN="${VIRTUALENV_PATH}/bin/python"
require_executable "${VERSION_NAME}" "virtualenv" 2>/dev/null || { require_executable "${VERSION_NAME}" "virtualenv" 2>/dev/null || {
require_executable "${VERSION_NAME}" "pip" require_executable "${VERSION_NAME}" "pip"
@@ -220,10 +219,12 @@ mkdir -p "${PYENV_VIRTUALENV_CACHE_PATH}"
cd "${PYENV_VIRTUALENV_CACHE_PATH}" cd "${PYENV_VIRTUALENV_CACHE_PATH}"
pyenv-exec virtualenv "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?" pyenv-exec virtualenv "${VIRTUALENV_OPTIONS[@]}" "${VIRTUALENV_PATH}" || STATUS="$?"
# create symlink of `python' bound for actual executable # Create symlink of `python' bound for actual executable
if [ ! -f "$VIRTUALENV_PYTHON_BIN" ]; then # TODO: remove this if virtualenv treats `python` executable
if [ -f "${VIRTUALENV_PATH}/bin/$(basename "${PYTHON_BIN}")" ]; then if [ ! -e "${VIRTUALENV_PATH}/bin/python" ]; then
( cd "${VIRTUALENV_PATH}/bin" && ln -fs "$(basename "${PYTHON_BIN}")" python ) PYTHON_BIN="$(pyenv-which python)"
if [ -L "${PYTHON_BIN}" ] && [ -e "${VIRTUALENV_PATH}/bin/$(basename "$(resolve_link "${PYTHON_BIN}")")" ]; then
( cd "${VIRTUALENV_PATH}/bin" && ln -s "${PYTHON_BIN}" "python" )
fi fi
fi fi