Merge pull request #1795 from TechEmpower/rvm-travis-tweaks

Travis testing for RVM

toolset/setup/linux/languages/rvm.sh

@@ -7,17 +7,14 @@ RETCODE=$(fw_exists rvm.installed)
   return 0;
 }
 
-# Never run installation inside of TRAVIS, 
-# just rely on their default RVM installaton
+export SHELL=/bin/bash
+gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
+\curl -sSL https://get.rvm.io | sudo bash -s stable
+
 if [ "$TRAVIS" = "true" ]
 then
-  echo "source /home/travis/.rvm/scripts/rvm" > $IROOT/rvm.installed
+  echo "source /usr/local/rvm/scripts/rvm" > $IROOT/rvm.installed
 else
-  # Run single-user installation and source rvm
-  export SHELL=/bin/bash
-  gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
-  \curl -sSL https://get.rvm.io | bash -s stable
-
   echo "source ~/.rvm/scripts/rvm" > $IROOT/rvm.installed
 fi