Browse Source

sh-rehash: Fix erroneously executing rather than printing a command (#3369)

pull/3370/head
native-api 7 months ago
committed by GitHub
parent
commit
0f7b8fa8ee
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
  1. +1
    -1
      libexec/pyenv-sh-rehash
  2. +16
    -2
      test/rehash.bats

+ 1
- 1
libexec/pyenv-sh-rehash View File

@ -11,7 +11,7 @@ shell="$(basename "${PYENV_SHELL:-$SHELL}")"
# When pyenv shell integration is enabled, delegate to pyenv-rehash,
# then tell the shell to empty its command lookup cache.
pyenv-rehash
echo "pyenv-rehash"
case "$shell" in
fish )

+ 16
- 2
test/rehash.bats View File

@ -110,13 +110,27 @@ SH
@test "sh-rehash in bash" {
create_executable "3.4" "python"
PYENV_SHELL=bash run pyenv-sh-rehash
assert_success "hash -r 2>/dev/null || true"
assert_success "pyenv-rehash
hash -r 2>/dev/null || true"
}
@test "sh-rehash in bash (integration)" {
create_executable "3.4" "python"
run eval "$(pyenv-sh-rehash)"
assert_success
assert [ -x "${PYENV_ROOT}/shims/python" ]
}
@test "sh-rehash in fish" {
create_executable "3.4" "python"
PYENV_SHELL=fish run pyenv-sh-rehash
assert_success ""
assert_success "pyenv-rehash"
}
@test "sh-rehash in fish (integration)" {
command -v fish >/dev/null || skip "-- fish not installed"
create_executable "3.4" "python"
run fish -Nc "eval (pyenv-sh-rehash)"
assert_success
assert [ -x "${PYENV_ROOT}/shims/python" ]
}

Loading…
Cancel
Save