From 2a48e8ea1221bf2006026c14ae170d6ece507ac7 Mon Sep 17 00:00:00 2001 From: Jim Myhrberg Date: Fri, 31 Aug 2012 13:40:34 +0300 Subject: [PATCH] Avoid loading rbenv twice if oh-my-zsh plugin has already loaded it --- shell/ruby.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/shell/ruby.sh b/shell/ruby.sh index 9eb7e57..a1a9b2f 100644 --- a/shell/ruby.sh +++ b/shell/ruby.sh @@ -37,8 +37,11 @@ fi # Load rbenv or RVM depending on which is available if [ -d "$HOME/.rbenv/bin" ]; then - export PATH="$HOME/.rbenv/bin:$PATH" - eval "$(rbenv init -)" + # Don't load rbenv again if oh-my-zsh's rbenv plugin already has + if [[ ":$PATH:" != *":$HOME/.rbenv/bin:"* ]]; then + path_prepend "$HOME/.rbenv/bin" + eval "$(rbenv init -)" + fi elif [ -s "$HOME/.rvm/scripts/rvm" ]; then source "$HOME/.rvm/scripts/rvm" fi