mirror of
https://github.com/hcartiaux/dotfiles.git
synced 2024-10-18 17:25:23 +02:00
[bash,zsh] Refactor the rvm configuration, always use the system ruby by default
This commit is contained in:
parent
e4458e3ded
commit
c9110ab32a
3 changed files with 13 additions and 20 deletions
|
@ -162,3 +162,16 @@ if [[ "$DOMAIN" = "gaia-cluster" ]] ; then
|
|||
#export XF_DEBUG=0
|
||||
fi
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Ruby & RVM
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
export PATH="$PATH:$(echo /usr/lib/ruby/gems/*)/bin:$HOME/.rvm/bin"
|
||||
|
||||
# RVM specific (see http://beginrescueend.com/)
|
||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" || true
|
||||
if [[ $(which ruby | grep -c "$HOME/.rvm") != 0 ]] ; then
|
||||
# Get off my lawn
|
||||
rvm reset
|
||||
fi
|
||||
|
||||
|
|
10
bash/bashrc
10
bash/bashrc
|
@ -262,13 +262,3 @@ if [ -f ~/.bash_oar ]; then
|
|||
. ~/.bash_oar
|
||||
fi
|
||||
|
||||
|
||||
# -------------------------------------------------------------------
|
||||
# Ruby & RVM
|
||||
# -------------------------------------------------------------------
|
||||
|
||||
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
|
||||
|
||||
# RVM specific (see http://beginrescueend.com/)
|
||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && . "$HOME/.rvm/scripts/rvm" || true
|
||||
|
||||
|
|
10
zsh/zshrc
10
zsh/zshrc
|
@ -172,13 +172,3 @@ fi
|
|||
eval `dircolors --sh`
|
||||
export GREP_COLOR=31
|
||||
|
||||
##################################################################
|
||||
## Ruby & RVM
|
||||
#
|
||||
|
||||
# Load RVM into a shell session *as a function*
|
||||
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
|
||||
|
||||
# Add System Ruby and RVM to PATH for scripting
|
||||
export PATH=$PATH:/usr/lib/ruby/gems/2.1.0/bin/:$HOME/.rvm/bin
|
||||
|
||||
|
|
Loading…
Reference in a new issue