From f080ebebbb409227d55334e7f502f665858b4aa8 Mon Sep 17 00:00:00 2001 From: Mike McQuaid Date: Tue, 10 Jul 2018 21:57:54 +0100 Subject: [PATCH] global: handle HOMEBREW_BOTTLE_DOMAIN fallback. If users have auto-updated then these variables may not be set. --- Library/Homebrew/global.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 5eda607832..d5c53f4b2c 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -25,8 +25,12 @@ HOMEBREW_USER_AGENT_CURL = ENV["HOMEBREW_USER_AGENT_CURL"] HOMEBREW_USER_AGENT_RUBY = "#{ENV["HOMEBREW_USER_AGENT"]} ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}".freeze HOMEBREW_USER_AGENT_FAKE_SAFARI = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_3) AppleWebKit/602.4.8 (KHTML, like Gecko) Version/10.0.3 Safari/602.4.8".freeze -HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] -HOMEBREW_BOTTLE_DOMAIN = ENV["HOMEBREW_BOTTLE_DOMAIN"] +# Bintray fallback is here for people auto-updating from a version where +# HOMEBREW_BOTTLE_DEFAULT_DOMAIN isn't set. +HOMEBREW_BOTTLE_DEFAULT_DOMAIN = ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] || + "https://homebrew.bintray.com" +HOMEBREW_BOTTLE_DOMAIN = ENV["HOMEBREW_BOTTLE_DOMAIN"] || + HOMEBREW_BOTTLE_DEFAULT_DOMAIN require "extend/fileutils"