admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Allow forcing Homebrew GitHub organisation.

Browse Source 
On Linux this defaults to Linuxbrew but in some cases (i.e. a Linux
machine performing uploads for Homebrew) we want to allow this to be
overridden back to the defaults.

Relies on a change incoming to `brew test-bot` to set this there.
This commit is contained in:
Mike McQuaid 2017-04-25 09:13:36 +01:00
parent 36a387da26
commit 228239af31
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/update.sh
View File

@ -23,7 +23,7 @@ git() {
} }
git_init_if_necessary() { git_init_if_necessary() {
if [[ -n "$HOMEBREW_MACOS" ]] if [[ -n "$HOMEBREW_MACOS" ]] || [[ -n "$HOMEBREW_FORCE_HOMEBREW_ORG" ]]
then then
BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew" BREW_OFFICIAL_REMOTE="https://github.com/Homebrew/brew"
CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core" CORE_OFFICIAL_REMOTE="https://github.com/Homebrew/homebrew-core"

12
Library/Homebrew/tap.rb
View File

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