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

Revert "uses_from_macos: fix force_homebrew_on_linux behaviour."

Browse Source
This commit is contained in:
Mike McQuaid 2020-11-09 16:26:09 +00:00 committed by GitHub
parent ba0a377b43
commit 9ad37ddc36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/software_spec.rb
View File

@ -1,8 +1,6 @@
# typed: false # typed: false
# frozen_string_literal: true # frozen_string_literal: true
# The Library/Homebrew/extend/os/software_spec.rb conditional logic will need to be more nuanced
# if this file ever includes more than `uses_from_macos`.
class SoftwareSpec class SoftwareSpec
undef uses_from_macos undef uses_from_macos

7
Library/Homebrew/extend/os/software_spec.rb
View File

@ -1,9 +1,8 @@
# typed: strict # typed: strict
# frozen_string_literal: true # frozen_string_literal: true
# This logic will need to be more nuanced if this file includes more than `uses_from_macos`. if OS.linux?
if OS.mac? || Homebrew::EnvConfig.force_homebrew_on_linux?
require "extend/os/mac/software_spec"
elsif OS.linux?
require "extend/os/linux/software_spec" require "extend/os/linux/software_spec"
elsif OS.mac?
require "extend/os/mac/software_spec"
end end