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

Merge pull request #12590 from hyuraku/remove_on_os_from_formula

Browse Source 
remove on_os from formula
This commit is contained in:
Mike McQuaid 2021-12-21 09:47:39 +00:00 committed by GitHub
commit 22f295aa53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Library/Homebrew/formula.rb
View File

@ -64,7 +64,6 @@ class Formula
include Utils::Shebang
include Utils::Shell
include Context
include OnOS # TODO: 3.3.0: deprecate OnOS usage in instance methods.
extend Enumerable
extend Forwardable
extend Cachable
@ -3065,7 +3064,7 @@ class Formula
block ||= case only_if
when :clt_installed
lambda do |_|
on_macos do
if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux?
T.cast(self, PourBottleCheck).reason(+<<~EOS)
The bottle needs the Apple Command Line Tools to be installed.
You can install them, if desired, with:

16
Library/Homebrew/test/formula_spec.rb
View File

@ -1542,12 +1542,8 @@ describe Formula do
attr_reader :test
def install
on_macos do
@test = 1
end
on_linux do
@test = 2
end
@test = 1 if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux?
@test = 2 if OS.linux?
end
end.new
end
@ -1565,12 +1561,8 @@ describe Formula do
attr_reader :test
def install
on_macos do
@test = 1
end
on_linux do
@test = 2
end
@test = 1 if OS.mac? || Homebrew::EnvConfig.simulate_macos_on_linux?
@test = 2 if OS.linux?
end
end.new
end