ruby_configurator.rb in rconf-0.6.14

- old
+ new

@@ -127,10 +127,11 @@
         end
         Dir.chdir(File.join(rvm_src, "rvm-#{version}")) do
           Command.execute('./install', :abort_on_failure => "Failed to install rvm #{version}")
         end
         report_success
+        aborting(true)
       end
       setup_bashrc
       true
     end
 
@@ -143,11 +144,11 @@
     # out(String):: Installation output
     def install_ruby(ruby)
       Platform.dispatch(ruby) { :install_ruby_prerequesites } 
       report_check("Installing #{ruby} (this will take a while, please be patient)")
       Command.execute('rvm', 'install', ruby, :abort_on_failure => 'Failed to install ruby')
-      Command.execute("rvm #{version}@#{gemset} exec -- gem install rconf")
+      res = Command.execute("rvm #{version}@#{gemset} exec -- gem install rconf")
       report_success
       res.output
     end
 
     # Make sure to install all required linux packages first
@@ -199,10 +200,9 @@
         File.open('.rvmrc', 'w') do |f|
           f.puts "rvm #{version}@#{gemset}"
           f.puts "type -P rconf &>/dev/null && { rconf; }"
           f.puts "type -P rconf &>/dev/null || { echo 'rconf not installed, skipping (see .rvmrc)'; }"
         end
-        Command.execute('rvm', "#{version}@#{gemset}", 'trust', 'rvmrc')
         report_success
         post_note "Configuration required switching the active ruby\nPlease run " + 'cd ..;cd -'.blue + ' to activate it and finish configuration'.green
       rescue Exception => e
         report_failure
         report_error(e.message)