mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-23 06:48:00 +00:00
Simplified rvm, rbenv, and Mac OS X Ruby settings.
This commit is contained in:
parent
42fc29e6a8
commit
06b989ebbb
@ -5,33 +5,25 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
# Install local gems according to Mac OS X conventions.
|
|
||||||
if [[ "$OSTYPE" == darwin* ]]; then
|
|
||||||
export GEM_HOME=$HOME/Library/Ruby/Gems/1.8
|
|
||||||
path=("$GEM_HOME/bin" $path)
|
|
||||||
|
|
||||||
# Set environment variables for launchd processes.
|
|
||||||
launchctl setenv GEM_HOME "$GEM_HOME" &!
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Loads RVM into the shell session.
|
# Loads RVM into the shell session.
|
||||||
if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
|
if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
|
||||||
# Let RVM manage the GEM_HOME.
|
|
||||||
unset GEM_HOME
|
|
||||||
|
|
||||||
# Auto adding variable-stored paths to ~ list conflicts with RVM.
|
# Auto adding variable-stored paths to ~ list conflicts with RVM.
|
||||||
unsetopt AUTO_NAME_DIRS
|
unsetopt AUTO_NAME_DIRS
|
||||||
|
|
||||||
# Source RVM.
|
# Source RVM.
|
||||||
source "$HOME/.rvm/scripts/rvm"
|
source "$HOME/.rvm/scripts/rvm"
|
||||||
fi
|
|
||||||
|
|
||||||
# Loads rbenv into the shell session.
|
# Loads rbenv into the shell session.
|
||||||
if [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
|
elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
|
||||||
# Let rbenv manage the GEM_HOME.
|
|
||||||
unset GEM_HOME
|
|
||||||
|
|
||||||
path=("$HOME/.rbenv/bin" $path)
|
path=("$HOME/.rbenv/bin" $path)
|
||||||
eval "$(rbenv init - zsh)"
|
eval "$(rbenv init - zsh)"
|
||||||
|
else
|
||||||
|
# Install local gems according to Mac OS X conventions.
|
||||||
|
if [[ "$OSTYPE" == darwin* ]]; then
|
||||||
|
export GEM_HOME="$HOME/Library/Ruby/Gems/1.8"
|
||||||
|
path=("$GEM_HOME/bin" $path)
|
||||||
|
|
||||||
|
# Set environment variables for launchd processes.
|
||||||
|
launchctl setenv GEM_HOME "$GEM_HOME" &!
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user