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

Merge pull request #1420 from jawshooah/fix-relocate

Browse Source 
keg_relocate: include hard links and fix replacement ordering
This commit is contained in:
Josh Hagins 2016-11-01 15:21:13 -04:00 committed by GitHub
commit f14a3a17de
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/Homebrew/keg_relocate.rb
View File

@ -66,11 +66,18 @@ class Keg
relocation.old_repository => relocation.new_repository, relocation.old_repository => relocation.new_repository,
} }
regexp = Regexp.union(replacements.keys) # Order matters here since `HOMEBREW_CELLAR` and `HOMEBREW_REPOSITORY` are
# children of `HOMEBREW_PREFIX` by default.
regexp = Regexp.union(
relocation.old_cellar,
relocation.old_repository,
relocation.old_prefix
)
changed = s.gsub!(regexp, replacements) changed = s.gsub!(regexp, replacements)
next unless changed next unless changed
changed_files << first.relative_path_from(path) changed_files += [first, *rest].map { |file| file.relative_path_from(path) }
begin begin
first.atomic_write(s) first.atomic_write(s)