Merge pull request #3939 from MikeMcQuaid/linuxbrew-core-not-yet

Don't use Linuxbrew/homebrew-core (yet, at least).
This commit is contained in:
Mike McQuaid 2018-03-16 20:31:35 +00:00 committed by GitHub
commit e8a4aad56c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions

View File

@ -23,15 +23,8 @@ git() {
}
git_init_if_necessary() {
if [[ -n "$HOMEBREW_MACOS" ]] || [[ -n "$HOMEBREW_FORCE_HOMEBREW_ORG" ]]
then
BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew"
CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"
elif [[ -n "$HOMEBREW_LINUX" ]]
then
BREW_OFFICIAL_REMOTE="https://github.com/Linuxbrew/brew"
CORE_OFFICIAL_REMOTE="https://github.com/Linuxbrew/homebrew-core"
fi
BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew"
CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"
safe_cd "$HOMEBREW_REPOSITORY"
if [[ ! -d ".git" ]]

View File

@ -543,11 +543,7 @@ end
# A specialized {Tap} class for the core formulae
class CoreTap < Tap
def default_remote
if OS.mac? || ENV["HOMEBREW_FORCE_HOMEBREW_ORG"]
"https://github.com/Homebrew/homebrew-core".freeze
else
"https://github.com/Linuxbrew/homebrew-core".freeze
end
"https://github.com/Homebrew/homebrew-core".freeze
end
# @private