From a9a4710fe17b6b3b9657d370d0dc5062ef25c7ab Mon Sep 17 00:00:00 2001
From: Effy Elden <github@effy.is>
Date: Sun, 23 Apr 2017 22:21:20 +1000
Subject: Alter Vagrantfile to use RVM for Ruby installation (#2346)

---
 Vagrantfile | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 2ff609425..6d7004faf 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -35,23 +35,12 @@ sudo apt-get install \
   libreadline-dev \
   -y
 
-# Install rbenv
-git clone https://github.com/rbenv/rbenv.git ~/.rbenv
-cd ~/.rbenv && src/configure && make -C src
-echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bash_profile
-echo 'eval "$(rbenv init -)"' >> ~/.bash_profile
-
-git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-
-export PATH="$HOME/.rbenv/bin:$PATH"
-eval "$(rbenv init -)"
-
+# Install rvm
 cd /vagrant
-
 read RUBY_VERSION < .ruby-version
-echo "Compiling Ruby $RUBY_VERSION: warning, this takes a while!!!"
-rbenv install $RUBY_VERSION
-rbenv global $RUBY_VERSION
+gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
+curl -sSL https://get.rvm.io | bash -s stable --ruby=$RUBY_VERSION
+source /home/vagrant/.rvm/scripts/rvm
 
 # Configure database
 sudo -u postgres createuser -U postgres vagrant -s
-- 
cgit