Merge pull request #10746 from Homebrew/revert-10743-bintray-outage

Revert "Temporarily change default Bintray domain"
Homebrew · Mar 1, 2021 · 5ca1b32 · 5ca1b32
2 parents 3e15503 + 40f3fb9
commit 5ca1b32
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Library/Homebrew/brew.sh b/Library/Homebrew/brew.sh
@@ -430,9 +430,9 @@ fi
 
 if [[ -n "$HOMEBREW_MACOS" || -n "$HOMEBREW_FORCE_HOMEBREW_ON_LINUX" ]]
 then
-  HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://dl.bintray.com/homebrew"
+  HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://homebrew.bintray.com"
 else
-  HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://dl.bintray.com/linuxbrew"
+  HOMEBREW_BOTTLE_DEFAULT_DOMAIN="https://linuxbrew.bintray.com"
 fi
 
 HOMEBREW_USER_AGENT="$HOMEBREW_PRODUCT/$HOMEBREW_USER_AGENT_VERSION ($HOMEBREW_SYSTEM; $HOMEBREW_PROCESSOR $HOMEBREW_OS_USER_AGENT_VERSION)"

diff --git a/Library/Homebrew/env_config.rb b/Library/Homebrew/env_config.rb
@@ -52,8 +52,8 @@ module EnvConfig
                       "download from the prefix `http://localhost:8080/`. " \
                       "If bottles are not available at `HOMEBREW_BOTTLE_DOMAIN` " \
                       "they will be downloaded from the default bottle domain.",
-        default_text: "macOS: `https://dl.bintray.com/homebrew`, " \
-                      "Linux: `https://dl.bintray.com/linuxbrew`.",
+        default_text: "macOS: `https://homebrew.bintray.com/`, " \
+                      "Linux: `https://linuxbrew.bintray.com/`.",
         default:      HOMEBREW_BOTTLE_DEFAULT_DOMAIN,
       },
       HOMEBREW_BREW_GIT_REMOTE:               {

diff --git a/docs/Manpage.md b/docs/Manpage.md
@@ -1731,7 +1731,7 @@ example, run `export HOMEBREW_NO_INSECURE_REDIRECT=1` rather than just
 - `HOMEBREW_BOTTLE_DOMAIN`
   <br>Use this URL as the download mirror for bottles. If bottles at that URL are temporarily unavailable, the default bottle domain will be used as a fallback mirror. For example, `HOMEBREW_BOTTLE_DOMAIN=http://localhost:8080` will cause all bottles to download from the prefix `http://localhost:8080/`. If bottles are not available at `HOMEBREW_BOTTLE_DOMAIN` they will be downloaded from the default bottle domain.
 
-  *Default:* macOS: `https://dl.bintray.com/homebrew`, Linux: `https://dl.bintray.com/linuxbrew`.
+  *Default:* macOS: `https://homebrew.bintray.com/`, Linux: `https://linuxbrew.bintray.com/`.
 
 - `HOMEBREW_BREW_GIT_REMOTE`
   <br>Use this URL as the Homebrew/brew `git`(1) remote.

diff --git a/manpages/brew.1 b/manpages/brew.1
@@ -2418,7 +2418,7 @@ If set, use Bootsnap to speed up repeated \fBbrew\fR calls\. A no\-op when using
 Use this URL as the download mirror for bottles\. If bottles at that URL are temporarily unavailable, the default bottle domain will be used as a fallback mirror\. For example, \fBHOMEBREW_BOTTLE_DOMAIN=http://localhost:8080\fR will cause all bottles to download from the prefix \fBhttp://localhost:8080/\fR\. If bottles are not available at \fBHOMEBREW_BOTTLE_DOMAIN\fR they will be downloaded from the default bottle domain\.
 .
 .IP
-\fIDefault:\fR macOS: \fBhttps://dl\.bintray\.com/homebrew\fR, Linux: \fBhttps://dl\.bintray\.com/linuxbrew\fR\.
+\fIDefault:\fR macOS: \fBhttps://homebrew\.bintray\.com/\fR, Linux: \fBhttps://linuxbrew\.bintray\.com/\fR\.
 .
 .TP
 \fBHOMEBREW_BREW_GIT_REMOTE\fR