From c8c2e38bcb6055c10d24b9c58193dc8a48418583 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Thu, 20 Aug 2020 13:09:18 +0200 Subject: [PATCH] Consistently use HOMEBREW_RUBY_WARNINGS when calling ruby Adding this in `dev-cmd/ruby.rb` allows us to suppress warnings like: ``` /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/language/python.rb:8: warning: Insecure world writable dir /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/shims/scm in PATH, mode 040777 ``` --- Library/Homebrew/dev-cmd/ruby.rb | 1 + Library/Homebrew/dev-cmd/test.rb | 2 +- Library/Homebrew/formula_info.rb | 2 +- Library/Homebrew/formula_installer.rb | 4 ++-- .../support/helper/spec/shared_context/integration_test.rb | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/dev-cmd/ruby.rb b/Library/Homebrew/dev-cmd/ruby.rb index 8b8d8eecd3..13477d5f6d 100644 --- a/Library/Homebrew/dev-cmd/ruby.rb +++ b/Library/Homebrew/dev-cmd/ruby.rb @@ -30,6 +30,7 @@ module Homebrew begin safe_system RUBY_PATH, + ENV["HOMEBREW_RUBY_WARNINGS"], "-I", $LOAD_PATH.join(File::PATH_SEPARATOR), "-rglobal", "-rdev-cmd/irb", *ruby_sys_args diff --git a/Library/Homebrew/dev-cmd/test.rb b/Library/Homebrew/dev-cmd/test.rb index 196652f9a5..35012774c2 100644 --- a/Library/Homebrew/dev-cmd/test.rb +++ b/Library/Homebrew/dev-cmd/test.rb @@ -78,7 +78,7 @@ module Homebrew begin exec_args = %W[ #{RUBY_PATH} - -W0 + #{ENV["HOMEBREW_RUBY_WARNINGS"]} -I #{$LOAD_PATH.join(File::PATH_SEPARATOR)} -- #{HOMEBREW_LIBRARY_PATH}/test.rb diff --git a/Library/Homebrew/formula_info.rb b/Library/Homebrew/formula_info.rb index 75013a40c1..4243d6d392 100644 --- a/Library/Homebrew/formula_info.rb +++ b/Library/Homebrew/formula_info.rb @@ -15,7 +15,7 @@ class FormulaInfo def self.lookup(name) json = Utils.popen_read( RUBY_PATH, - "-W0", + ENV["HOMEBREW_RUBY_WARNINGS"], "-I", $LOAD_PATH.join(File::PATH_SEPARATOR), HOMEBREW_LIBRARY_PATH/"brew.rb", "info", diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 57a62988e1..34a2992ab1 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -798,7 +798,7 @@ class FormulaInstaller # the easiest way to do this args = %W[ nice #{RUBY_PATH} - -W0 + #{ENV["HOMEBREW_RUBY_WARNINGS"]} -I #{$LOAD_PATH.join(File::PATH_SEPARATOR)} -- #{HOMEBREW_LIBRARY_PATH}/build.rb @@ -966,7 +966,7 @@ class FormulaInstaller def post_install args = %W[ nice #{RUBY_PATH} - -W0 + #{ENV["HOMEBREW_RUBY_WARNINGS"]} -I #{$LOAD_PATH.join(File::PATH_SEPARATOR)} -- #{HOMEBREW_LIBRARY_PATH}/postinstall.rb diff --git a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb index 619eae5c80..ed35329cc7 100644 --- a/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb +++ b/Library/Homebrew/test/support/helper/spec/shared_context/integration_test.rb @@ -84,7 +84,7 @@ RSpec.shared_context "integration test" do @ruby_args ||= begin ruby_args = [ - "-W0", + ENV["HOMEBREW_RUBY_WARNINGS"], "-I", $LOAD_PATH.join(File::PATH_SEPARATOR) ] if ENV["HOMEBREW_TESTS_COVERAGE"]