From b76a252380eb59de3886b1584b02b3678aba9f21 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 17 Nov 2013 11:00:47 +0000
Subject: [PATCH] Fix minor issues and duplicates shell env PATH setup

---
 shell/env.sh   | 4 ++--
 shell/ruby.sh  | 8 +++-----
 shell/zshrc.sh | 2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/shell/env.sh b/shell/env.sh
index 9fe9df3..1d8bac9 100644
--- a/shell/env.sh
+++ b/shell/env.sh
@@ -29,8 +29,8 @@ path_prepend "$HOME/bin"
 path_prepend "$DOTBIN"
 
 # Relative Paths - must be first in PATH
-path_prepend "./node_modules/.bin" # Node.js
-path_prepend "./vendor/bundle/bin" # Ruby Bundler
+path_append "./node_modules/.bin" # Node.js
+path_append "./vendor/bundle/bin" # Ruby Bundler
 
 # Ensure TMPDIR is the same for local and remote ssh logins
 if [[ $TMPDIR == "/var/folders/"* ]] || [[ $TMPDIR == "" ]]; then
diff --git a/shell/ruby.sh b/shell/ruby.sh
index 817b3a8..7d526b6 100644
--- a/shell/ruby.sh
+++ b/shell/ruby.sh
@@ -37,11 +37,9 @@ fi
 
 # Load rbenv or RVM depending on which is available
 if [ -d "$HOME/.rbenv/bin" ]; then
-  # 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
+  path_prepend "$HOME/.rbenv/bin"
+  path_prepend "$HOME/.rbenv/shims"
+  eval "$(rbenv init -)"
 elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
   source "$HOME/.rvm/scripts/rvm"
 fi
diff --git a/shell/zshrc.sh b/shell/zshrc.sh
index b38cc8b..903091f 100644
--- a/shell/zshrc.sh
+++ b/shell/zshrc.sh
@@ -35,7 +35,7 @@ DISABLE_AUTO_TITLE="true"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(brew bundler cake cap gem heroku node nyan osx powder python rails3 \
-  rbenv ruby thor vagrant)
+  ruby thor vagrant)
 
 source "$ZSH/oh-my-zsh.sh"