setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Don't duplicate shims in PATH"

Browse Source 
Too many of our users have a shell initialization set up that
inadvertently duplicates some or most of the entries in their PATH,
bringing the system paths again in front of rbenv's shims. If this was a
nested shell (a typical scenario when starting up tmux), `rbenv init`
would get eval'd again but this time, shims won't get added to the front
of the PATH and would only stay and the end of the path, effectively
rendering them useless.

I tried to argue that this is a user problem rather than rbenv's, but I
can't fix everybody shell init when they report bugs. Instead, let's
revert to simpler times in rbenv where we just roll along with the
duplication and don't ask any questions.

This reverts commit 03fa148e814d50aba8012dc94b866213a00ea8a9.

Fixes #369
This commit is contained in:
Mislav Marohnić 2014-10-15 01:36:20 +02:00
parent e851250da6
commit e2173df4aa
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libexec/rbenv-init
View File

@ -92,22 +92,13 @@ fi
mkdir -p "${RBENV_ROOT}/"{shims,versions}
if [[ ":${PATH}:" != *:"${RBENV_ROOT}/shims":* ]]; then
case "$shell" in
fish )
echo "setenv PATH '${RBENV_ROOT}/shims' \$PATH"
;;
* )
echo 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
;;
esac
fi
case "$shell" in
fish )
echo "setenv PATH '${RBENV_ROOT}/shims' \$PATH"
echo "setenv RBENV_SHELL $shell"
;;
* )
echo 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
echo "export RBENV_SHELL=$shell"
;;
esac

BIN
libexec/rbenv-realpath.dylib Executable file
View File

Binary file not shown.

4
test/init.bats
View File

@ -64,11 +64,11 @@ load test_helper
assert_line 0 "setenv PATH '${RBENV_ROOT}/shims' \$PATH"
}
@test "doesn't add shims to PATH more than once" {
@test "can add shims to PATH more than once" {
export PATH="${RBENV_ROOT}/shims:$PATH"
run rbenv-init - bash
assert_success
refute_line 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
assert_line 0 'export PATH="'${RBENV_ROOT}'/shims:${PATH}"'
}
@test "doesn't add shims to PATH more than once (fish)" {