From 2e5fbf57af80d930274f1c9ecc3fe3e03c20b84f Mon Sep 17 00:00:00 2001 From: Cheng Xu Date: Fri, 17 May 2019 17:29:12 +0800 Subject: [PATCH 1/2] brew.sh: export HOMEBREW_BOTTLE_DEFAULT_DOMAIN It is used in `global.rb` and `brew bottle`. Closes https://github.com/Homebrew/linuxbrew-core/issues/13110. --- Library/Homebrew/brew.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index ba6592eba5..d373039c34 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -235,6 +235,7 @@ export HOMEBREW_MACOS_VERSION export HOMEBREW_MACOS_VERSION_NUMERIC export HOMEBREW_USER_AGENT export HOMEBREW_USER_AGENT_CURL +export HOMEBREW_BOTTLE_DEFAULT_DOMAIN if [[ -n "$HOMEBREW_MACOS" && -x "/usr/bin/xcode-select" ]] then From 6437a70a5f1deaa5b757d4b6ad00e1a22f78cc56 Mon Sep 17 00:00:00 2001 From: Cheng Xu Date: Fri, 17 May 2019 17:24:44 +0800 Subject: [PATCH 2/2] Revert "Elide default root_url in the bottle block" This reverts commit e4f4e0f98b6ff9c0f9f988345c2257fbc151e8b0. This is no longer necessary as `HOMEBREW_FORCE_HOMEBREW_ON_LINUX` is set when uploading bottles for Homebrew. --- Library/Homebrew/dev-cmd/bottle.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/bottle.rb b/Library/Homebrew/dev-cmd/bottle.rb index 774b268cbf..4bb7388637 100644 --- a/Library/Homebrew/dev-cmd/bottle.rb +++ b/Library/Homebrew/dev-cmd/bottle.rb @@ -13,7 +13,7 @@ require "erb" BOTTLE_ERB = <<-EOS.freeze bottle do - <% if !["#{HOMEBREW_BOTTLE_DEFAULT_DOMAIN}/bottles", "https://homebrew.bintray.com/bottles"].include?(root_url) %> + <% if !root_url.start_with?(HOMEBREW_BOTTLE_DEFAULT_DOMAIN) %> root_url "<%= root_url %>" <% end %> <% if ![Homebrew::DEFAULT_PREFIX, "/usr/local"].include?(prefix) %>