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

Fix linuxbrew-core migration not applying to Linuxbrew/homebrew-core

Browse Source
This commit is contained in:
Bo Anderson 2021-12-11 22:27:46 +00:00
parent 3373a82d22
commit 6fa70337e3
No known key found for this signature in database
GPG Key ID: 3DB94E204E137D65
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/brew.sh
View File

@ -554,7 +554,7 @@ Your Git executable: $(unset git && type -p ${HOMEBREW_GIT})"
unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH unset HOMEBREW_MACOS_SYSTEM_RUBY_NEW_ENOUGH
HOMEBREW_CORE_REPOSITORY_ORIGIN="$("${HOMEBREW_GIT}" -C "${HOMEBREW_CORE_REPOSITORY}" remote get-url origin 2>/dev/null)" HOMEBREW_CORE_REPOSITORY_ORIGIN="$("${HOMEBREW_GIT}" -C "${HOMEBREW_CORE_REPOSITORY}" remote get-url origin 2>/dev/null)"
if [[ "${HOMEBREW_CORE_REPOSITORY_ORIGIN}" =~ /linuxbrew-core(\.git)?$ ]] if [[ "${HOMEBREW_CORE_REPOSITORY_ORIGIN}" =~ (/linuxbrew|Linuxbrew/homebrew)-core(\.git)?$ ]]
then then
# triggers migration code in update.sh # triggers migration code in update.sh
# shellcheck disable=SC2034 # shellcheck disable=SC2034

2
Library/Homebrew/tap.rb
View File

@ -827,7 +827,7 @@ class CoreTap < Tap
# @private # @private
sig { returns(T::Boolean) } sig { returns(T::Boolean) }
def linuxbrew_core? def linuxbrew_core?
remote_repo.to_s.end_with?("/linuxbrew-core") remote_repo.to_s.end_with?("/linuxbrew-core") || remote_repo == "Linuxbrew/homebrew-core"
end end
# @private # @private