mirror of
https://github.com/jimeh/dotfiles.git
synced 2026-02-19 13:46:41 +00:00
Fix minor issues and duplicates shell env PATH setup
This commit is contained in:
@@ -29,8 +29,8 @@ path_prepend "$HOME/bin"
|
|||||||
path_prepend "$DOTBIN"
|
path_prepend "$DOTBIN"
|
||||||
|
|
||||||
# Relative Paths - must be first in PATH
|
# Relative Paths - must be first in PATH
|
||||||
path_prepend "./node_modules/.bin" # Node.js
|
path_append "./node_modules/.bin" # Node.js
|
||||||
path_prepend "./vendor/bundle/bin" # Ruby Bundler
|
path_append "./vendor/bundle/bin" # Ruby Bundler
|
||||||
|
|
||||||
# Ensure TMPDIR is the same for local and remote ssh logins
|
# Ensure TMPDIR is the same for local and remote ssh logins
|
||||||
if [[ $TMPDIR == "/var/folders/"* ]] || [[ $TMPDIR == "" ]]; then
|
if [[ $TMPDIR == "/var/folders/"* ]] || [[ $TMPDIR == "" ]]; then
|
||||||
|
|||||||
@@ -37,11 +37,9 @@ fi
|
|||||||
|
|
||||||
# Load rbenv or RVM depending on which is available
|
# Load rbenv or RVM depending on which is available
|
||||||
if [ -d "$HOME/.rbenv/bin" ]; then
|
if [ -d "$HOME/.rbenv/bin" ]; then
|
||||||
# Don't load rbenv again if oh-my-zsh's rbenv plugin already has
|
path_prepend "$HOME/.rbenv/bin"
|
||||||
if [[ ":$PATH:" != *":$HOME/.rbenv/bin:"* ]]; then
|
path_prepend "$HOME/.rbenv/shims"
|
||||||
path_prepend "$HOME/.rbenv/bin"
|
eval "$(rbenv init -)"
|
||||||
eval "$(rbenv init -)"
|
|
||||||
fi
|
|
||||||
elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
|
elif [ -s "$HOME/.rvm/scripts/rvm" ]; then
|
||||||
source "$HOME/.rvm/scripts/rvm"
|
source "$HOME/.rvm/scripts/rvm"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ DISABLE_AUTO_TITLE="true"
|
|||||||
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
plugins=(brew bundler cake cap gem heroku node nyan osx powder python rails3 \
|
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"
|
source "$ZSH/oh-my-zsh.sh"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user