Unset environment variables which starts with VIRTUALENV_. These variables are reserved for virtualenv.

This commit is contained in:
Yamashita Yuu
2013-05-08 15:51:09 +09:00
parent c8b9969619
commit 16470ec39c

View File

@@ -97,7 +97,8 @@ http_get_wget() {
} }
version() { version() {
echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${VIRTUALENV_VERSION})" local version="$(pyenv-exec python "${VIRTUALENV}" --version || true)"
echo "pyenv-virtualenv ${PYENV_VIRTUALENV_VERSION} (virtualenv ${version:-unknown})"
} }
usage() { usage() {
@@ -124,13 +125,18 @@ if [ -z "${PYENV_VIRTUALENV_SCRIPT_PATH}" ]; then
PYENV_VIRTUALENV_SCRIPT_PATH="${PYENV_VIRTUALENV_ROOT}/libexec/pyenv-virtualenv" PYENV_VIRTUALENV_SCRIPT_PATH="${PYENV_VIRTUALENV_ROOT}/libexec/pyenv-virtualenv"
fi fi
VIRTUALENV="${PYENV_VIRTUALENV_SCRIPT_PATH}/${VIRTUALENV_VERSION}/virtualenv.py" VIRTUALENV="${PYENV_VIRTUALENV_SCRIPT_PATH}/${VIRTUALENV_VERSION}/virtualenv.py"
VIRTUALENV_URL="https://raw.github.com/pypa/virtualenv/${VIRTUALENV_VERSION}/virtualenv.py"
VIRTUALENV_OPTIONS=() VIRTUALENV_OPTIONS=()
ensure_virtualenv "${VIRTUALENV}" "https://raw.github.com/pypa/virtualenv/${VIRTUALENV_VERSION}/virtualenv.py" || { ensure_virtualenv "${VIRTUALENV}" "${VIRTUALENV_URL}" || {
echo "pyenv-virtualenv: could not find virtualenv script: ${VIRTUALENV}" 1>&2 echo "pyenv-virtualenv: could not find virtualenv script: ${VIRTUALENV}" 1>&2
exit 1 exit 1
} }
# Unset environment variables which starts with `VIRTUALENV_`.
# These variables are reserved for virtualenv.
unset VIRTUALENV_VERSION
parse_options "$@" parse_options "$@"
for option in "${OPTIONS[@]}"; do for option in "${OPTIONS[@]}"; do
case "$option" in case "$option" in