mirror of
https://github.com/pyenv/pyenv.git
synced 2025-11-16 15:23:53 -05:00
Avoid invoking hash -r in fish
It doesn't exist as a builtin, and it doesn't seem there is a way to detect support for a shell builtin that is portable. So, just detect fish and don't the rehash command at all. Fixes #478
This commit is contained in:
@@ -15,11 +15,9 @@ rbenv-rehash
|
||||
|
||||
case "$shell" in
|
||||
fish )
|
||||
or='; or'
|
||||
# no rehash support
|
||||
;;
|
||||
* )
|
||||
or='||'
|
||||
echo "hash -r 2>/dev/null || true"
|
||||
;;
|
||||
esac
|
||||
|
||||
echo "hash -r 2>/dev/null $or true"
|
||||
|
||||
@@ -109,6 +109,6 @@ SH
|
||||
@test "sh-rehash in fish" {
|
||||
create_executable "2.0" "ruby"
|
||||
RBENV_SHELL=fish run rbenv-sh-rehash
|
||||
assert_success "hash -r 2>/dev/null ; or true"
|
||||
assert_success ""
|
||||
assert [ -x "${RBENV_ROOT}/shims/ruby" ]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user