From 8dd59548edd5eede2c290d369dbb83b5817bb38d Mon Sep 17 00:00:00 2001
From: Mike McQuaid <mike@mikemcquaid.com>
Date: Fri, 12 Oct 2018 22:04:47 +0100
Subject: [PATCH] bottles: make `or_later` the default.

When Mojave was in beta we made it so that High Sierra bottles would
automatically be used on Mojave. Let's make this the default in general:
older bottles will be used on newer versions of macOS when a newer
bottle is not available.

This should make it easier for taps to bottle single versions of bottles
which will work more widely and to give us breathing room whenever a new
version of macOS is released.

Currently this only applies to the `wine` formula which will have the
`or_later` removed in a Homebrew/homebrew-core PR.

Question: should we use an `odeprecated` for the use of `or_later`?
---
 .../Homebrew/extend/os/mac/utils/bottles.rb   | 33 +++++++------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/Library/Homebrew/extend/os/mac/utils/bottles.rb b/Library/Homebrew/extend/os/mac/utils/bottles.rb
index cfc6b6c822..1093f1309c 100644
--- a/Library/Homebrew/extend/os/mac/utils/bottles.rb
+++ b/Library/Homebrew/extend/os/mac/utils/bottles.rb
@@ -26,7 +26,9 @@ module Utils
       alias generic_find_matching_tag find_matching_tag
 
       def find_matching_tag(tag)
-        generic_find_matching_tag(tag) || find_altivec_tag(tag) || find_or_later_tag(tag)
+        generic_find_matching_tag(tag) ||
+          find_altivec_tag(tag) ||
+          find_older_compatible_tag(tag)
       end
 
       # This allows generic Altivec PPC bottles to be supported in some
@@ -40,9 +42,8 @@ module Utils
         altivec_tag if key?(altivec_tag)
       end
 
-      # Allows a bottle tag to specify a specific OS or later,
-      # so the same bottle can target multiple OSs.
-      def find_or_later_tag(tag)
+      # Find a bottle built for a previous version of macOS.
+      def find_older_compatible_tag(tag)
         begin
           tag_version = MacOS::Version.from_symbol(tag)
         rescue ArgumentError
@@ -50,27 +51,15 @@ module Utils
         end
 
         keys.find do |key|
-          if key.to_s.end_with?("_or_later")
-            later_tag = key.to_s[/(\w+)_or_later$/, 1].to_sym
-            MacOS::Version.from_symbol(later_tag) <= tag_version
-          elsif ARGV.force_bottle?
-            true
-          # Allow prerelease versions to act as if all bottles are `_or_later`
-          # so that they don't need to wait for us to bottle everything for the
-          # new release.
-          elsif install_older_prerelease_bottles?
-            true
+          # TODO: move to compat?
+          key_tag_version = if key.to_s.end_with?("_or_later")
+            key.to_s[/(\w+)_or_later$/, 1].to_sym
+          else
+            key
           end
+          MacOS::Version.from_symbol(key_tag_version) <= tag_version
         end
       end
-
-      def install_older_prerelease_bottles?
-        return false unless OS::Mac.prerelease?
-        return true if ENV["HOMEBREW_INSTALL_OLDER_PRERELEASE_BOTTLES"]
-        return false if ENV["HOMEBREW_NO_INSTALL_OLDER_PRERELEASE_BOTTLES"]
-
-        !ARGV.homebrew_developer?
-      end
     end
   end
 end