From 3e93d4c6cf1da02c3dc4ca01451768effc915afc Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 20 Jul 2018 14:28:14 +0100
Subject: [PATCH] Add HOMEBREW_FORCE_BOTTLE variable
This does the equivalent of always passing `--force-bottle`. This will
be enabled by default on Mojave to allow people to avoid building
everything from source until our porting and bottling is a bit further
along.
---
Library/Homebrew/brew.sh | 8 ++++++++
Library/Homebrew/extend/ARGV.rb | 3 ++-
Library/Homebrew/manpages/brew.1.md.erb | 6 ++++++
docs/Manpage.md | 6 ++++++
manpages/brew.1 | 4 ++++
5 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
index d60da9db99..a0671cd944 100644
--- a/Library/Homebrew/brew.sh
+++ b/Library/Homebrew/brew.sh
@@ -262,6 +262,14 @@ then
# Don't allow non-developers to customise Ruby warnings.
unset HOMEBREW_RUBY_WARNINGS
+
+ # Default non-developers to bottles on prerelease versions of macOS
+ # in default prefix.
+ if [[ "$HOMEBREW_PREFIX" = "/usr/local" &&
+ "$HOMEBREW_MACOS_VERSION_NUMERIC" -ge "101400" ]]
+ then
+ export HOMEBREW_FORCE_BOTTLE="1"
+ fi
fi
if [[ -z "$HOMEBREW_RUBY_WARNINGS" ]]
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb
index f214fb75ec..b626c3e59c 100644
--- a/Library/Homebrew/extend/ARGV.rb
+++ b/Library/Homebrew/extend/ARGV.rb
@@ -262,7 +262,8 @@ module HomebrewArgvExtension
end
def force_bottle?
- include? "--force-bottle"
+ return false if ENV["HOMEBREW_NO_FORCE_BOTTLE"]
+ include?("--force-bottle") || !ENV["HOMEBREW_FORCE_BOTTLE"].nil?
end
def fetch_head?
diff --git a/Library/Homebrew/manpages/brew.1.md.erb b/Library/Homebrew/manpages/brew.1.md.erb
index 902d6bde5b..2c25995d41 100644
--- a/Library/Homebrew/manpages/brew.1.md.erb
+++ b/Library/Homebrew/manpages/brew.1.md.erb
@@ -170,6 +170,12 @@ Note that environment variables must have a value set to be detected. For exampl
directories. TextMate can handle this correctly in project mode, but many
editors will do strange things in this case.
+ * `HOMEBREW_FORCE_BOTTLE`:
+ If set, Homebrew will install from a bottle if it exists for the
+ current or newest version of macOS, even if it would not normally be used
+ for installation. Please do not file issues if you encounter errors when
+ using this environment variable.
+
* `HOMEBREW_FORCE_BREWED_CURL`:
If set, Homebrew will use a Homebrew-installed `curl` rather than the
system version.
diff --git a/docs/Manpage.md b/docs/Manpage.md
index f41954f240..55f5babd79 100644
--- a/docs/Manpage.md
+++ b/docs/Manpage.md
@@ -1167,6 +1167,12 @@ Note that environment variables must have a value set to be detected. For exampl
directories. TextMate can handle this correctly in project mode, but many
editors will do strange things in this case.
+ * `HOMEBREW_FORCE_BOTTLE`:
+ If set, Homebrew will install from a bottle if it exists for the
+ current or newest version of macOS, even if it would not normally be used
+ for installation. Please do not file issues if you encounter errors when
+ using this environment variable.
+
* `HOMEBREW_FORCE_BREWED_CURL`:
If set, Homebrew will use a Homebrew-installed `curl` rather than the
system version.
diff --git a/manpages/brew.1 b/manpages/brew.1
index d084f3b709..879169d77e 100644
--- a/manpages/brew.1
+++ b/manpages/brew.1
@@ -1109,6 +1109,10 @@ If set, Homebrew will use this editor when editing a single formula, or several
\fINote:\fR \fBbrew edit\fR will open all of Homebrew as discontinuous files and directories\. TextMate can handle this correctly in project mode, but many editors will do strange things in this case\.
.
.TP
+\fBHOMEBREW_FORCE_BOTTLE\fR
+If set, Homebrew will install from a bottle if it exists for the current or newest version of macOS, even if it would not normally be used for installation\. Please do not file issues if you encounter errors when using this environment variable\.
+.
+.TP
\fBHOMEBREW_FORCE_BREWED_CURL\fR
If set, Homebrew will use a Homebrew\-installed \fBcurl\fR rather than the system version\.
.
--
GitLab