From 2e446f1872e3dbcb33e4c872063e45210fbd67e5 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Tue, 9 May 2017 10:52:31 +0100 Subject: [PATCH] Make ruby setup compatible with homebrew installed rbenv --- shell/ruby.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/shell/ruby.sh b/shell/ruby.sh index e1302fa..4a4b8d2 100755 --- a/shell/ruby.sh +++ b/shell/ruby.sh @@ -46,10 +46,13 @@ fi # Load rbenv or RVM depending on which is available if [ -d "$HOME/.rbenv/bin" ]; then path_prepend "$HOME/.rbenv/bin" - # if [[ ":$PATH:" != *":$HOME/.rbenv/shims:"* ]]; then +fi + +if [ -n "$(command -v rbenv)" ]; then eval "$(rbenv init -)" - # fi -elif [ -s "$HOME/.rvm/scripts/rvm" ]; then +fi + +if [ -s "$HOME/.rvm/scripts/rvm" ]; then path_append "$HOME/.rvm/bin" source "$HOME/.rvm/scripts/rvm" fi