mirrors/rbenv
1
0
Fork 0
mirror of https://github.com/rbenv/rbenv.git synced 2024-12-28 20:55:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Avoid invoking hash -r in fish

Browse source 
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:
Mislav Marohnić 2013-10-31 20:16:26 +02:00
parent 44e76bea23
commit f1fdb9bbc8
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libexec/rbenv-sh-rehash
View file

@ -15,11 +15,9 @@ rbenv-rehash
case "$shell" in case "$shell" in
fish ) fish )
or='; or' # no rehash support
;; ;;
* ) * )
or='||' echo "hash -r 2>/dev/null || true"
;; ;;
esac esac
echo "hash -r 2>/dev/null $or true"

2
test/rehash.bats
View file

@ -109,6 +109,6 @@ SH
@test "sh-rehash in fish" { @test "sh-rehash in fish" {
create_executable "2.0" "ruby" create_executable "2.0" "ruby"
RBENV_SHELL=fish run rbenv-sh-rehash RBENV_SHELL=fish run rbenv-sh-rehash
assert_success "hash -r 2>/dev/null ; or true" assert_success ""
assert [ -x "${RBENV_ROOT}/shims/ruby" ] assert [ -x "${RBENV_ROOT}/shims/ruby" ]
} }