admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use #present? and #blank? to check env variable

Browse Source
This commit is contained in:
Rylan Polster 2021-06-18 12:07:34 -04:00
parent b096bf1fed
commit 1d516b628b
No known key found for this signature in database
GPG Key ID: 46A744940CFF4D64
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/untap.rb
View File

@ -25,7 +25,7 @@ module Homebrew
args = untap_args.parse args = untap_args.parse
args.named.to_installed_taps.each do |tap| args.named.to_installed_taps.each do |tap|
odie "Untapping #{tap} is not allowed" if tap.core_tap? && !ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"] odie "Untapping #{tap} is not allowed" if tap.core_tap? && ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"].blank?
installed_tap_formulae = Formula.installed.select { |formula| formula.tap == tap } installed_tap_formulae = Formula.installed.select { |formula| formula.tap == tap }
installed_tap_casks = Cask::Caskroom.casks.select { |cask| cask.tap == tap } installed_tap_casks = Cask::Caskroom.casks.select { |cask| cask.tap == tap }

2
Library/Homebrew/cmd/update-report.rb
View File

@ -207,7 +207,7 @@ module Homebrew
def install_core_tap_if_necessary def install_core_tap_if_necessary
return if ENV["HOMEBREW_UPDATE_TEST"] return if ENV["HOMEBREW_UPDATE_TEST"]
return if ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"] return if ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"].present?
core_tap = CoreTap.instance core_tap = CoreTap.instance
return if core_tap.installed? return if core_tap.installed?

2
Library/Homebrew/formulary.rb
View File

@ -361,7 +361,7 @@ module Formulary
end end
def get_formula(*) def get_formula(*)
if !CoreTap.instance.installed? && ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"] if !CoreTap.instance.installed? && ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"].present?
raise CoreTapFormulaUnavailableError, name raise CoreTapFormulaUnavailableError, name
end end

4
Library/Homebrew/tap.rb
View File

@ -734,7 +734,7 @@ class CoreTap < Tap
def self.ensure_installed! def self.ensure_installed!
return if instance.installed? return if instance.installed?
return if ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"] return if ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"].present?
safe_system HOMEBREW_BREW_FILE, "tap", instance.name safe_system HOMEBREW_BREW_FILE, "tap", instance.name
end end
@ -751,7 +751,7 @@ class CoreTap < Tap
# @private # @private
sig { params(manual: T::Boolean).void } sig { params(manual: T::Boolean).void }
def uninstall(manual: false) def uninstall(manual: false)
raise "Tap#uninstall is not available for CoreTap" unless ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"] raise "Tap#uninstall is not available for CoreTap" if ENV["HOMEBREW_UNTAP_HOMEBREW_CORE"].blank?
super super
end end