m/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-16 07:13:53 -05:00
Code Wiki Activity

Merge pull request #850 from jasonkarns/remove-legacy-global-version-file

Browse Source 
Remove support for legacy global version files
This commit is contained in:
Mislav Marohnić
2015-12-29 14:40:37 +01:00
parent fec0f56d0b fe809ea90d
commit e199a3d8f7
4 changed files with 9 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libexec/rbenv-global
View File

@@ -27,8 +27,5 @@ RBENV_VERSION_FILE="${RBENV_ROOT}/version"
if [ -n "$RBENV_VERSION" ]; then
rbenv-version-file-write "$RBENV_VERSION_FILE" "$RBENV_VERSION"
else
rbenv-version-file-read "$RBENV_VERSION_FILE" ||
rbenv-version-file-read "${RBENV_ROOT}/global" ||
rbenv-version-file-read "${RBENV_ROOT}/default" ||
echo system
rbenv-version-file-read "$RBENV_VERSION_FILE" || echo system
fi

10
libexec/rbenv-version-file
View File

@@ -22,15 +22,7 @@ find_local_version_file() {
find_global_version_file() {
local global_version_file="${RBENV_ROOT}/version"
if [ -e "$global_version_file" ]; then
echo "$global_version_file"
elif [ -e "${RBENV_ROOT}/global" ]; then
echo "${RBENV_ROOT}/global"
elif [ -e "${RBENV_ROOT}/default" ]; then
echo "${RBENV_ROOT}/default"
else
echo "$global_version_file"
fi
echo "$global_version_file"
}
if [ -n "$target_dir" ]; then