setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'avoid-infinite-loop-even-if-pwd-returns-relative-path'

Browse Source
This commit is contained in:
Yamashita Yuu 2014-01-03 08:36:05 +09:00
commit f956502fd8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libexec/pyenv
View File

@ -44,13 +44,13 @@ fi
export PYENV_ROOT export PYENV_ROOT
if [ -z "${PYENV_DIR}" ]; then if [ -z "${PYENV_DIR}" ]; then
PYENV_DIR="$(abs_dirname "$(pwd)/..")" PYENV_DIR="$(pwd)"
else else
cd "$PYENV_DIR" 2>/dev/null || { cd "$PYENV_DIR" 2>/dev/null || {
echo "pyenv: cannot change working directory to \`$PYENV_DIR'" echo "pyenv: cannot change working directory to \`$PYENV_DIR'"
exit 1 exit 1
} >&2 } >&2
PYENV_DIR="$(abs_dirname "$(pwd)/..")" PYENV_DIR="$(pwd)"
cd "$OLDPWD" cd "$OLDPWD"
fi fi
export PYENV_DIR export PYENV_DIR

5
libexec/pyenv-version-file
View File

@ -4,8 +4,8 @@ set -e
[ -n "$PYENV_DEBUG" ] && set -x [ -n "$PYENV_DEBUG" ] && set -x
find_local_version_file() { find_local_version_file() {
local root="$1" local prev root="$1"
while [ -n "$root" ]; do while [ -n "$root" ] && [ "$root" != "$prev" ]; do
if [ -e "${root}/.python-version" ]; then if [ -e "${root}/.python-version" ]; then
echo "${root}/.python-version" echo "${root}/.python-version"
exit exit
@ -13,6 +13,7 @@ find_local_version_file() {
echo "${root}/.pyenv-version" echo "${root}/.pyenv-version"
exit exit
fi fi
prev="${root}"
root="${root%/*}" root="${root%/*}"
done done
} }