1
0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-17 15:53:45 -05:00

reliably detect parent shell in rbenv init

`$SHELL` variable is a terrible way of detecting the current shell
because it's not even supposed to reflect the current shell; it's meant
for keeping the value of the default shell for programs to start.

If an explicit `<shell>` argument wasn't passed to `rbenv init`, it
tries to detect the shell by getting the name of its parent process. If
this fails, it falls back on the value of `$SHELL` as before.

Furthermore, `rbenv init` will set the RBENV_SHELL variable in the
current shell to the value of the detected shell so that `sh-shell` and
`sh-rehash` commands don't have to repeat the detection.
This commit is contained in:
Mislav Marohnić
2013-09-28 18:43:39 +02:00
parent ff23666d56
commit 878bd87328
6 changed files with 34 additions and 17 deletions

View File

@@ -19,14 +19,21 @@ load test_helper
@test "setup shell completions" {
root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
SHELL=/bin/bash run rbenv-init -
run rbenv-init - bash
assert_success
assert_line "source '${root}/libexec/../completions/rbenv.bash'"
}
@test "detect parent shell" {
root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
SHELL=/bin/false run rbenv-init -
assert_success
assert_line "export RBENV_SHELL=bash"
}
@test "setup shell completions (fish)" {
root="$(cd $BATS_TEST_DIRNAME/.. && pwd)"
SHELL=/usr/bin/fish run rbenv-init -
run rbenv-init - fish
assert_success
assert_line ". '${root}/libexec/../completions/rbenv.fish'"
}
@@ -39,28 +46,28 @@ load test_helper
@test "adds shims to PATH" {
export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin"
SHELL=/bin/bash run rbenv-init -
run rbenv-init - bash
assert_success
assert_line 0 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
}
@test "adds shims to PATH (fish)" {
export PATH="${BATS_TEST_DIRNAME}/../libexec:/usr/bin:/bin"
SHELL=/usr/bin/fish run rbenv-init -
run rbenv-init - fish
assert_success
assert_line 0 "setenv PATH '${RBENV_ROOT}/shims' \$PATH"
}
@test "doesn't add shims to PATH more than once" {
export PATH="${RBENV_ROOT}/shims:$PATH"
SHELL=/bin/bash run rbenv-init -
run rbenv-init - bash
assert_success
refute_line 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
}
@test "doesn't add shims to PATH more than once (fish)" {
export PATH="${RBENV_ROOT}/shims:$PATH"
SHELL=/usr/bin/fish run rbenv-init -
run rbenv-init - fish
assert_success
refute_line 'setenv PATH "'${RBENV_ROOT}'/shims" $PATH ;'
}