Use Homebrew.default_prefix? in more places.
This commit is contained in:
parent
902e058f3e
commit
699d543ecd
@ -802,7 +802,7 @@ module Homebrew
|
|||||||
end
|
end
|
||||||
|
|
||||||
def check_homebrew_prefix
|
def check_homebrew_prefix
|
||||||
return if HOMEBREW_PREFIX.to_s == Homebrew::DEFAULT_PREFIX
|
return if Homebrew.default_prefix?
|
||||||
|
|
||||||
<<~EOS
|
<<~EOS
|
||||||
Your Homebrew's prefix is not #{Homebrew::DEFAULT_PREFIX}.
|
Your Homebrew's prefix is not #{Homebrew::DEFAULT_PREFIX}.
|
||||||
|
@ -16,7 +16,7 @@ module Utils
|
|||||||
def os_prefix_ci
|
def os_prefix_ci
|
||||||
@os_prefix_ci ||= begin
|
@os_prefix_ci ||= begin
|
||||||
os = OS_VERSION
|
os = OS_VERSION
|
||||||
prefix = ", #{custom_prefix_label}" if HOMEBREW_PREFIX.to_s != Homebrew::DEFAULT_PREFIX
|
prefix = ", #{custom_prefix_label}" if Homebrew.default_prefix?
|
||||||
ci = ", CI" if ENV["CI"]
|
ci = ", CI" if ENV["CI"]
|
||||||
"#{os}#{prefix}#{ci}"
|
"#{os}#{prefix}#{ci}"
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user