bin/rconf in rconf-0.9.9 vs bin/rconf in rconf-0.9.10
- old
+ new
@@ -137,12 +137,11 @@
rubies = rubies.split("\n")[3..-1]
report_fatal 'Failed to list install rubies (is rvm in your path?)' unless rubies
rubies.each do |ruby|
ruby =~ /(\s+| =>)([^ ]*)\s.*/
ruby = Regexp.last_match(2)
- gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list',
- :env => { 'rvm_is_not_a_shell_function' => '0' }).output.split("\n")
+ gemsets = Command.execute('rvm', ruby, 'exec', 'rvm', 'gemset', 'list').output.split("\n")
i = gemsets.index { |gs| gs =~ /^gemsets for #{ruby} / }
if i
gemsets = gemsets[i + 1..-1]
gemsets.each do |gs|
gs = gs.lstrip
@@ -162,20 +161,18 @@
# === Return
# true:: Always return true
def update_rconf(version)
run_in_all_gemsets do |ruby, gs|
report_check("Checking rconf for #{ruby}@#{gs}")
- rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
- :env => { 'rvm_is_not_a_shell_function' => '0' }).output
+ rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
if rconf =~ /rconf \(#{version}/
report_success
elsif rconf =~ /^rconf /
report_failure
report_check("Updating rconf for #{ruby}@#{gs}")
res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'install',
- 'rconf', '-v', version, '--no-ri', '--no-rdoc',
- :env => { 'rvm_is_not_a_shell_function' => '0' })
+ 'rconf', '-v', version, '--no-ri', '--no-rdoc')
report_result(res.success?)
else
report('SKIPPED (no rconf)')
end
end
@@ -186,15 +183,13 @@
# === Return
# true:: Always return true
def remove
ProgressReporter.report_to_stdout
run_in_all_gemsets do |ruby, gs|
- rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf',
- :env => { 'rvm_is_not_a_shell_function' => '0' }).output
+ rconf = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'list', 'rconf').output
if rconf =~ /^rconf /
report_check("Removing rconf from #{ruby}@#{gs}")
- res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf',
- :env => { 'rvm_is_not_a_shell_function' => '0' })
+ res = Command.execute('rvm', "#{ruby}@#{gs}", 'gem', 'uninstall', '-a', '-x', 'rconf')
report_result(res.success?)
end
end
end