From d60020f1a946421cd7af91a50b274b7bce06e78a Mon Sep 17 00:00:00 2001
From: Josh Hagins
Date: Tue, 1 Nov 2016 11:55:03 -0400
Subject: keg_relocate: fix ordering of replacements

---
 Library/Homebrew/keg_relocate.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb
index 41686b1bb..b878781e1 100644
--- a/Library/Homebrew/keg_relocate.rb
+++ b/Library/Homebrew/keg_relocate.rb
@@ -66,7 +66,14 @@ class Keg
         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)
 
       next unless changed
-- 
cgit v1.2.3


From e57d312ad1caa09ca0cd7cc4727dfd4b247d9971 Mon Sep 17 00:00:00 2001
From: Josh Hagins
Date: Tue, 1 Nov 2016 12:58:38 -0400
Subject: keg_relocate: don't forget the hard links

---
 Library/Homebrew/keg_relocate.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Library/Homebrew/keg_relocate.rb b/Library/Homebrew/keg_relocate.rb
index b878781e1..0ab4b9731 100644
--- a/Library/Homebrew/keg_relocate.rb
+++ b/Library/Homebrew/keg_relocate.rb
@@ -77,7 +77,7 @@ class Keg
       changed = s.gsub!(regexp, replacements)
 
       next unless changed
-      changed_files << first.relative_path_from(path)
+      changed_files += [first, *rest].map { |file| file.relative_path_from(path) }
 
       begin
         first.atomic_write(s)
-- 
cgit v1.2.3