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

Merge pull request #1015 from MikeMcQuaid/relocate-repository

Browse Source 
Relocate HOMEBREW_REPOSITORY when necessary.
This commit is contained in:
Mike McQuaid 2016-09-19 08:14:44 +01:00 committed by GitHub
commit e4fb2ce3bd
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Homebrew/dev-cmd/bottle.rb
View File

@ -177,6 +177,7 @@ module Homebrew
tar_path = Pathname.pwd/tar_filename tar_path = Pathname.pwd/tar_filename
prefix = HOMEBREW_PREFIX.to_s prefix = HOMEBREW_PREFIX.to_s
repository = HOMEBREW_REPOSITORY.to_s
cellar = HOMEBREW_CELLAR.to_s cellar = HOMEBREW_CELLAR.to_s
ohai "Bottling #{filename}..." ohai "Bottling #{filename}..."
@ -193,7 +194,8 @@ module Homebrew
keg.relocate_dynamic_linkage prefix, Keg::PREFIX_PLACEHOLDER, keg.relocate_dynamic_linkage prefix, Keg::PREFIX_PLACEHOLDER,
cellar, Keg::CELLAR_PLACEHOLDER cellar, Keg::CELLAR_PLACEHOLDER
keg.relocate_text_files prefix, Keg::PREFIX_PLACEHOLDER, keg.relocate_text_files prefix, Keg::PREFIX_PLACEHOLDER,
cellar, Keg::CELLAR_PLACEHOLDER cellar, Keg::CELLAR_PLACEHOLDER,
repository, Keg::REPOSITORY_PLACEHOLDER
end end
keg.delete_pyc_files! keg.delete_pyc_files!
@ -248,6 +250,7 @@ module Homebrew
skip_relocation = true skip_relocation = true
else else
relocatable = false if keg_contain?(prefix_check, keg, ignores) relocatable = false if keg_contain?(prefix_check, keg, ignores)
relocatable = false if keg_contain?(repository, keg, ignores)
relocatable = false if keg_contain?(cellar, keg, ignores) relocatable = false if keg_contain?(cellar, keg, ignores)
if prefix != prefix_check if prefix != prefix_check
relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg) relocatable = false if keg_contain_absolute_symlink_starting_with?(prefix, keg)
@ -265,7 +268,8 @@ module Homebrew
keg.relocate_dynamic_linkage Keg::PREFIX_PLACEHOLDER, prefix, keg.relocate_dynamic_linkage Keg::PREFIX_PLACEHOLDER, prefix,
Keg::CELLAR_PLACEHOLDER, cellar Keg::CELLAR_PLACEHOLDER, cellar
keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, prefix, keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, prefix,
Keg::CELLAR_PLACEHOLDER, cellar Keg::CELLAR_PLACEHOLDER, cellar,
Keg::REPOSITORY_PLACEHOLDER, repository
end end
end end
end end

3
Library/Homebrew/formula_installer.rb
View File

@ -779,7 +779,8 @@ class FormulaInstaller
Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s
end end
keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s, keg.relocate_text_files Keg::PREFIX_PLACEHOLDER, HOMEBREW_PREFIX.to_s,
Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s Keg::CELLAR_PLACEHOLDER, HOMEBREW_CELLAR.to_s,
Keg::REPOSITORY_PLACEHOLDER, HOMEBREW_REPOSITORY.to_s
Pathname.glob("#{formula.bottle_prefix}/{etc,var}/**/*") do |path| Pathname.glob("#{formula.bottle_prefix}/{etc,var}/**/*") do |path|
path.extend(InstallRenamed) path.extend(InstallRenamed)

5
Library/Homebrew/keg_relocate.rb
View File

@ -1,6 +1,7 @@
class Keg class Keg
PREFIX_PLACEHOLDER = "@@HOMEBREW_PREFIX@@".freeze PREFIX_PLACEHOLDER = "@@HOMEBREW_PREFIX@@".freeze
CELLAR_PLACEHOLDER = "@@HOMEBREW_CELLAR@@".freeze CELLAR_PLACEHOLDER = "@@HOMEBREW_CELLAR@@".freeze
REPOSITORY_PLACEHOLDER = "@@HOMEBREW_REPOSITORY@@".freeze
def fix_dynamic_linkage def fix_dynamic_linkage
symlink_files.each do |file| symlink_files.each do |file|
@ -18,13 +19,15 @@ class Keg
[] []
end end
def relocate_text_files(old_prefix, new_prefix, old_cellar, new_cellar) def relocate_text_files(old_prefix, new_prefix, old_cellar, new_cellar,
old_repository, new_repository)
files = text_files | libtool_files files = text_files | libtool_files
files.group_by { |f| f.stat.ino }.each_value do |first, *rest| files.group_by { |f| f.stat.ino }.each_value do |first, *rest|
s = first.open("rb", &:read) s = first.open("rb", &:read)
changed = s.gsub!(old_cellar, new_cellar) changed = s.gsub!(old_cellar, new_cellar)
changed = s.gsub!(old_prefix, new_prefix) || changed changed = s.gsub!(old_prefix, new_prefix) || changed
changed = s.gsub!(old_repository, new_repository) || changed
next unless changed next unless changed