mirror of
https://github.com/gosticks/brew.git
synced 2026-10-04 22:46:55 +00:00
replace_text_in_files: Regex match is greedy
The regex matches the longest possible string. Order does not matter.
This commit is contained in:
@@ -68,17 +68,7 @@ class Keg
|
||||
relocation.old_cellar => relocation.new_cellar,
|
||||
relocation.old_repository => relocation.new_repository,
|
||||
}
|
||||
|
||||
# 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.union(replacements.keys), replacements)
|
||||
next unless changed
|
||||
changed_files += [first, *rest].map { |file| file.relative_path_from(path) }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user