diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh index e863a15ce5..ebea36c38c 100644 --- a/Library/Homebrew/brew.sh +++ b/Library/Homebrew/brew.sh @@ -86,6 +86,7 @@ then HOMEBREW_OS_VERSION="macOS $HOMEBREW_MACOS_VERSION" # Don't change this from Mac OS X to match what macOS itself does in Safari on 10.12 HOMEBREW_OS_USER_AGENT_VERSION="Mac OS X $HOMEBREW_MACOS_VERSION" + HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://homebrew.bintray.com" # The system Curl is too old for some modern HTTPS certificates on # older macOS versions. @@ -110,6 +111,7 @@ else [[ -n "$HOMEBREW_LINUX" ]] && HOMEBREW_OS_VERSION="$(lsb_release -sd 2>/dev/null)" : "${HOMEBREW_OS_VERSION:=$(uname -r)}" HOMEBREW_OS_USER_AGENT_VERSION="$HOMEBREW_OS_VERSION" + HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://linuxbrew.bintray.com" CACHE_HOME="${XDG_CACHE_HOME:-${HOME}/.cache}" HOMEBREW_CACHE="${HOMEBREW_CACHE:-${CACHE_HOME}/Homebrew}" @@ -274,7 +276,6 @@ then export HOMEBREW_RUBY_WARNINGS="-W0" fi -export HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://homebrew.bintray.com" if [[ -z "$HOMEBREW_BOTTLE_DOMAIN" ]] then export HOMEBREW_BOTTLE_DOMAIN="$HOMEBREW_BOTTLE_DEFAULT_DOMAIN" diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index 3d1e293d70..f99c9b9516 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -8,6 +8,7 @@ require "pp" require_relative "load_path" require "config" +require "os" require "extend/ARGV" require "messages" require "system_command" @@ -36,8 +37,14 @@ HOMEBREW_USER_AGENT_FAKE_SAFARI = # 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_DEFAULT_DOMAIN = if ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] + ENV["HOMEBREW_BOTTLE_DEFAULT_DOMAIN"] +elsif OS.mac? + "https://homebrew.bintray.com".freeze +else + "https://linuxbrew.bintray.com".freeze +end + HOMEBREW_BOTTLE_DOMAIN = ENV["HOMEBREW_BOTTLE_DOMAIN"] || HOMEBREW_BOTTLE_DEFAULT_DOMAIN @@ -108,7 +115,6 @@ HOMEBREW_INTERNAL_COMMAND_ALIASES = { require "set" -require "os" require "extend/pathname" require "extend/module"