From 8e5f4f60e8e9948a1e6267cdb75d2da63d2daff1 Mon Sep 17 00:00:00 2001
From: Miquel Sabaté <mikisabate@gmail.com>
Date: Fri, 27 Dec 2013 16:05:42 +0100
Subject: bash: removed conflict on rvm

---
 bashrc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'bashrc')

diff --git a/bashrc b/bashrc
index 4deee9e..d88657f 100644
--- a/bashrc
+++ b/bashrc
@@ -16,7 +16,7 @@ export VISUAL=vim
 alias vi=vim
 
 # We want a full-fledged 256-color terminal.
-export TERM=xterm-256color
+TERM=xterm-256color
 
 # Set the LESS and the PAGER environment variables.
 export LESS="FSRX"
@@ -51,9 +51,6 @@ export CMAKE_INCLUDE_PATH=$KDEDIR/include:$CMAKE_INCLUDE_PATH
 # Function to whip the KDevelop cache
 alias wduchain='rm -rf $HOME/.cache/kdevduchain/*'
 
-# Load RVM into a shell session *as a function*
-[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
-
 # Alias bundle exec
 alias be='bundle exec'
 
@@ -68,3 +65,7 @@ source $HOME/.review_completion.sh
 # The g utility. See: https://github.com/mssola/g
 source $HOME/.g.sh
 source $HOME/.gcompletion.sh
+
+# Finally get RVM straight.
+source $HOME/.rvm/scripts/rvm
+
-- 
cgit v1.2.3