github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Search for plugins in PYENV_DIR and PYENV_ROOT (#1697)

Browse source
This commit is contained in:
cornfeedhobo 2020-10-01 20:33:34 -05:00 committed by GitHub
parent 71d2e4549e
commit cadebd8e65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libexec/pyenv
View file

@ -94,7 +94,10 @@ export PYENV_DIR
shopt -s nullglob shopt -s nullglob
bin_path="$(abs_dirname "$0")" bin_path="$(abs_dirname "$0")"
for plugin_bin in "${PYENV_ROOT}/plugins/"*/bin; do for plugin_bin in "${bin_path%/*}"/plugins/*/bin; do
PATH="${plugin_bin}:${PATH}"
done
for plugin_bin in "${PYENV_ROOT}"/plugins/*/bin; do
PATH="${plugin_bin}:${PATH}" PATH="${plugin_bin}:${PATH}"
done done
export PATH="${bin_path}:${PATH}" export PATH="${bin_path}:${PATH}"

3
test/pyenv.bats
View file

@ -48,7 +48,7 @@ load test_helper
@test "adds its own libexec to PATH" { @test "adds its own libexec to PATH" {
run pyenv echo "PATH" run pyenv echo "PATH"
assert_success "${BATS_TEST_DIRNAME%/*}/libexec:$PATH" assert_success "${BATS_TEST_DIRNAME%/*}/libexec:${BATS_TEST_DIRNAME%/*}/plugins/python-build/bin:$PATH"
} }
@test "adds plugin bin dirs to PATH" { @test "adds plugin bin dirs to PATH" {
@ -59,6 +59,7 @@ load test_helper
assert_line 0 "${BATS_TEST_DIRNAME%/*}/libexec" assert_line 0 "${BATS_TEST_DIRNAME%/*}/libexec"
assert_line 1 "${PYENV_ROOT}/plugins/python-build/bin" assert_line 1 "${PYENV_ROOT}/plugins/python-build/bin"
assert_line 2 "${PYENV_ROOT}/plugins/pyenv-each/bin" assert_line 2 "${PYENV_ROOT}/plugins/pyenv-each/bin"
assert_line 3 "${BATS_TEST_DIRNAME%/*}/plugins/python-build/bin"
} }
@test "PYENV_HOOK_PATH preserves value from environment" { @test "PYENV_HOOK_PATH preserves value from environment" {