Merge branch 'license-forbidden' of https://github.com/MLH-Fellowship/brew into license-forbidden

Library/Homebrew/env_config.rb

@@ -112,7 +112,7 @@ module Homebrew
         default:     15,
       },
       HOMEBREW_FORBIDDEN_LICENSES:        {
-        description: "Use this environment variable to define a blacklist of space separated licenses and Homebrew " \
+        description: "Use this environment variable to define a denylist of space separated licenses and Homebrew " \
                      "will avoid installing the packages with those licenses.",
       },
       HOMEBREW_FORCE_BREWED_CURL:         {

Library/Homebrew/formula_installer.rb

@@ -1106,23 +1106,17 @@ class FormulaInstaller
     $stderr.puts @requirement_messages
   end
 
-  def env_forbidden_licenses
+  def forbidden_license_check
-    Homebrew::EnvConfig.forbidden_licenses.split(" ")
+    forbidden_licenses = Homebrew::EnvConfig.forbidden_licenses.split(" ")
-  end
+    return if forbidden_licenses.blank?
 
-  def forbidden_license_check(f)
+    if forbidden_licenses.include? formula.license
-    return if ENV["HOMEBREW_FORBIDDEN_LICENSES"].blank?
-
-    forbidden_licenses = env_forbidden_licenses
-
-    if forbidden_licenses.include? f.license
       raise CannotInstallFormulaError, <<~EOS
-        #{f.name} has a forbidden license #{f.license}.
+        #{formula.name} has a forbidden license #{formula.license}.
       EOS
     end
 
-    fi = FormulaInstaller.new(f)
+    compute_dependencies.each do |dep, _|
-    fi.compute_dependencies.each do |dep, _|
       dep_f = dep.to_formula
       next unless forbidden_licenses.include? dep_f.license