Skip to content

Commit

Permalink
A better way
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelklishin committed May 27, 2012
1 parent a08d08a commit e80d61c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 2 additions & 2 deletions ci_environment/rvm/recipes/multi.rb
Expand Up @@ -50,7 +50,7 @@
# make sure default Ruby is installed first
bash "installing #{default_ruby}" do
setup.call(self)
code "#{rvm} install #{default_ruby} && #{rvm} use --default #{default_ruby}"
code "rm -rf $HOME/.rvm/gemsets/global.gems && rm -rf $HOME/.rvm/gemsets/default.gems && #{rvm} install #{default_ruby} && #{rvm} use --default #{default_ruby}"
not_if "#{rvm} #{default_ruby} do echo 'Found'"
end

Expand Down Expand Up @@ -99,5 +99,5 @@

bash "clean up RVM sources, log files, etc" do
setup.call(self)
code "echo 'yes' | #{rvm} @global,default do gem uninstall rvm rubygems-bundler -a -I && #{rvm} cleanup all"
code "#{rvm} cleanup all"
end
Expand Up @@ -116,5 +116,3 @@ export JAVA_HOME="/usr/lib/jvm/java-6-<%= node['java']['install_flavor'] %>"
# has already been agreed on by Bundler and RVM maintainers), we need to
# remove them to make sure bundler behavior does not change. MK.
echo 'yes' | rvm @global,default do gem uninstall rvm rubygems-bundler -a -I
# per discussion with mpapis. MK.
rm -r ~/.rvm/gemsets/default*

0 comments on commit e80d61c

Please sign in to comment.