diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 22:14:26 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-10-14 22:14:26 +0200 |
| commit | b2eaf5562dd8378a7c83cc544885ea475d44f912 (patch) | |
| tree | 1d79559ae73a8f658569a0a01459452c903bb34b /Vagrantfile | |
| parent | 7aec1bc30862b81de8dcb43b61f8fdd13c935ecd (diff) | |
| parent | ec6eee96d0b398a99ba0abb9c1cf30c02729e52e (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Upstream added some documentation in the README, but our README is pretty different and barebone. Kept our README.
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Vagrantfile b/Vagrantfile index 25f563d95..aeff2f233 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -45,16 +45,8 @@ sudo apt-get install \ # Install rvm read RUBY_VERSION < .ruby-version -gpg_command="gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB" -$($gpg_command) -if [ $? -ne 0 ];then - echo "GPG command failed, This prevented RVM from installing." - echo "Retrying once..." && $($gpg_command) - if [ $? -ne 0 ];then - echo "GPG failed for the second time, please ensure network connectivity." - echo "Exiting..." && exit 1 - fi -fi +curl -sSL https://rvm.io/mpapis.asc | gpg --import +curl -sSL https://rvm.io/pkuczynski.asc | gpg --import curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION source /home/vagrant/.rvm/scripts/rvm |