瀏覽代碼

Fixes #2047 Ruby related tests fail in vagrant box due to RVM wrong install

Zloy 9 年之前
父節點
當前提交
bf9bbfef2c
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      toolset/setup/linux/languages/rvm.sh

+ 3 - 1
toolset/setup/linux/languages/rvm.sh

@@ -9,12 +9,14 @@ RETCODE=$(fw_exists ${IROOT}/rvm.installed)
 
 
 export SHELL=/bin/bash
 export SHELL=/bin/bash
 gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
 gpg --keyserver hkp://keys.gnupg.net --recv-keys D39DC0E3
-\curl -sSL https://get.rvm.io | sudo bash -s stable
+RVM_INSTALLER="curl -sSL https://get.rvm.io"
 
 
 if [ "$TRAVIS" = "true" ]
 if [ "$TRAVIS" = "true" ]
 then
 then
+  $RVM_INSTALLER | sudo bash -s stable
   echo "source /usr/local/rvm/scripts/rvm" > $IROOT/rvm.installed
   echo "source /usr/local/rvm/scripts/rvm" > $IROOT/rvm.installed
 else
 else
+  $RVM_INSTALLER | bash -s stable
   echo "source ~/.rvm/scripts/rvm" > $IROOT/rvm.installed
   echo "source ~/.rvm/scripts/rvm" > $IROOT/rvm.installed
 fi
 fi