Fix minor issues and duplicates shell env PATH setup

This commit is contained in:
2013-11-17 11:00:47 +00:00
parent f437efa4be
commit b76a252380
3 changed files with 6 additions and 8 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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"