From de736ffb7d1f02161b8a919b26523e3eebc534c1 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Thu, 3 Sep 2020 19:25:58 +0000 Subject: [PATCH 1/2] system_config.rb: show system Ruby info on Linux --- Library/Homebrew/extend/os/linux/system_config.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Library/Homebrew/extend/os/linux/system_config.rb b/Library/Homebrew/extend/os/linux/system_config.rb index 6916d3d129..07ae3e8a40 100644 --- a/Library/Homebrew/extend/os/linux/system_config.rb +++ b/Library/Homebrew/extend/os/linux/system_config.rb @@ -4,6 +4,7 @@ require "formula" require "os/linux/glibc" module SystemConfig + SYSTEM_RUBY_PATH = "/usr/bin/ruby" class << self def host_glibc_version version = OS::Linux::Glibc.system_version @@ -27,12 +28,20 @@ module SystemConfig "N/A" end + def system_ruby_version + out, _, status = system_command(SYSTEM_RUBY_PATH, args: ["-e", "puts RUBY_VERSION"], print_stderr: false) + return "N/A" unless status.success? + + out + end + def dump_verbose_config(out = $stdout) dump_generic_verbose_config(out) out.puts "Kernel: #{`uname -mors`.chomp}" out.puts "OS: #{OS::Linux.os_version}" out.puts "Host glibc: #{host_glibc_version}" out.puts "/usr/bin/gcc: #{host_gcc_version}" + out.puts "/usr/bin/ruby: #{system_ruby_version}" if RUBY_PATH != SYSTEM_RUBY_PATH ["glibc", "gcc", "xorg"].each do |f| out.puts "#{f}: #{formula_linked_version f}" end From 40f1994eec4ce5c3c957e44260f6ecd40e09cb80 Mon Sep 17 00:00:00 2001 From: Maxim Belkin Date: Fri, 4 Sep 2020 08:30:02 -0500 Subject: [PATCH 2/2] system_config.rb: rename SYSTEM_RUBY_PATH to HOST_RUBY_PATH Co-authored-by: Mike McQuaid --- Library/Homebrew/extend/os/linux/system_config.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Library/Homebrew/extend/os/linux/system_config.rb b/Library/Homebrew/extend/os/linux/system_config.rb index 07ae3e8a40..0f76a99d2b 100644 --- a/Library/Homebrew/extend/os/linux/system_config.rb +++ b/Library/Homebrew/extend/os/linux/system_config.rb @@ -4,7 +4,8 @@ require "formula" require "os/linux/glibc" module SystemConfig - SYSTEM_RUBY_PATH = "/usr/bin/ruby" + HOST_RUBY_PATH = "/usr/bin/ruby" + class << self def host_glibc_version version = OS::Linux::Glibc.system_version @@ -28,8 +29,8 @@ module SystemConfig "N/A" end - def system_ruby_version - out, _, status = system_command(SYSTEM_RUBY_PATH, args: ["-e", "puts RUBY_VERSION"], print_stderr: false) + def host_ruby_version + out, _, status = system_command(HOST_RUBY_PATH, args: ["-e", "puts RUBY_VERSION"], print_stderr: false) return "N/A" unless status.success? out @@ -41,7 +42,7 @@ module SystemConfig out.puts "OS: #{OS::Linux.os_version}" out.puts "Host glibc: #{host_glibc_version}" out.puts "/usr/bin/gcc: #{host_gcc_version}" - out.puts "/usr/bin/ruby: #{system_ruby_version}" if RUBY_PATH != SYSTEM_RUBY_PATH + out.puts "/usr/bin/ruby: #{host_ruby_version}" if RUBY_PATH != HOST_RUBY_PATH ["glibc", "gcc", "xorg"].each do |f| out.puts "#{f}: #{formula_linked_version f}" end