From e2173df4aa91c8d365ca1596fb857fcac9fdd787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mislav=20Marohni=C4=87?= <mislav.marohnic@gmail.com>
Date: Wed, 15 Oct 2014 01:36:20 +0200
Subject: [PATCH] Revert "Don't duplicate shims in PATH"

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
---
 libexec/rbenv-init           |  13 ++-----------
 libexec/rbenv-realpath.dylib | Bin 0 -> 8672 bytes
 test/init.bats               |   4 ++--
 3 files changed, 4 insertions(+), 13 deletions(-)
 create mode 100755 libexec/rbenv-realpath.dylib

diff --git a/libexec/rbenv-init b/libexec/rbenv-init
index 5f9079a..fbffb85 100755
--- a/libexec/rbenv-init
+++ b/libexec/rbenv-init
@@ -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
diff --git a/libexec/rbenv-realpath.dylib b/libexec/rbenv-realpath.dylib
new file mode 100755
index 0000000000000000000000000000000000000000..c42aca38256af4e3c9531371636e35fb94e1bfe3
GIT binary patch
literal 8672
zcmeHNL2MgE6#Z@rN!vgi)I*?vrd3h}N;gIzQA8`*D2q0tL}?O4B`DLiJ*ihXYiD=e
zBo!7#r3cF@<j8?TPuzeC&LAX^;08h*DnQ5wK(Q2%#W9L7|L@Mk>#foo2c-Gd?Eml2
z%-fmgwX`$i@3#N^XAmGY008%5xgX2eJpk7sjS;|uSSI%YaK31sUkp?Im#A4UCoysY
z(uAB;$$22w0*WF_@^$Wu@}J9k!uw?$y8Uo94mtOOTHfDHCHX$4iJ(0YIUt;pF}Weh
zM{_2N_;^W_tHKL$|9rocd`8$BfH2C^vpdFD@B`0rFUc0k@%<(FK9ThbE5bf*Ombdx
zR~@&=9e1e`;{Ng79Eo~bl7MiMLso^3b5Y_;p1mxhY;t^?l5b3QB23T7UPjN!DHNFV
z>D*#2)=E7edw6<Ih*xoQ?v}Z~zMQX=c{T9%<WqF?n5w>XSNcBVnDerIH@>taQu8Dn
z@2{R?;wIy~Xa{x_N4S5!8Of)<2f}^Naj$C_k#5wM^RqLvFPhUc>Nm#1YLGue0Et_u
zF&T|Zh9Rb(&nYZ4k9giNrpiuUtck*umly8klb*24RXZpd#dWNJV*pn(#K59krO_)b
zC_RaocrQv%&lJ_S5Yrf{N3ozkgk=s(+(<_%cboql_8*FOlJODrbf2F;-G1S{b7wN2
zjZd$9u=3&HIOb4NfCC4^^0>m3LmS3I<E6ed)>P^vynPC$YQ9HGP+3^_1F>v8FD1ZM
z0LQTq@B1to&tnqbL`-%93)K_OqSvMs&<bb;v;tZIt$<eG|DwRlR^xZ;+E&JD)H~MO
z^$v}D<T|}IePizIO98as4dX4U*lq9*EwrpJC`V>B&5qT~4p~jG8s=@QS--uxO!<b{
z!agl(qe!=q6WWjB#kz6kO>)gz>lSQ26NdFx!~Ah`f|_8F#KhBSzt!z_o90%-+-aIS
z*0rxQ7rxr)PP~S6-HF%3>qWetz41s6U2dT}@g(|<64A8(z`iA#RQnf-9-`<6j3)ep
zFzxu&vc1lPT_~}++@dv`d&y+Bcd524+~5i33BOXlj4L-5Ekm3FD?9ERzQGntf{8UJ
zV18f+H6I+GWtg*+U|O|($svl*F}LELydt~`s{|$CtvbFiK)r(R28>?FU0jQ?S5;&f
z#s!)R&Iul-04?t6-ImtKPot-z*1HtbJNGd5OozP@AkE>>VQ^(0Qfui{dU$YXgUA#1
zy<C_6B>ivFt7d;od|Iv#RX&hdt>YE7S`XC|?NvYRwE|iJt$<cQE1(t73TOqi0$KsB
zfL1^&pcVM<6&O95UdYYUC%V^Y7S9EX;o&;Z<9Rb4hM!x34OmH!X7RjO2#UuruHxZ#
zutbO<Qd=71)4BOqW@b75S72clD{;eNw~phV3kLEvryMvg94}T1Z~~9WYlQ$Z1JF5w
z+ZMMNUcO~C62zfx|2j;6BRGvkZ7Cea9Mw(A93A=6cF3XF(H_EZ8zih4!JcYgg7!g1
z4gjcqiDMF5bhwB16c%i*?gh^#a4vz*C$Kv2jQ#f^8_zN5>7lgfWk{4BlIldVE5UcG
N`=!3)Tf=dY{R^K+djJ3c

literal 0
HcmV?d00001

diff --git a/test/init.bats b/test/init.bats
index aa50f09..78a762f 100644
--- a/test/init.bats
+++ b/test/init.bats
@@ -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)" {