From 61cda1465f6d5db241801f8e5a4ec66453711835 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Tue, 9 Feb 2021 18:34:47 +0000 Subject: [PATCH] os/mac/version: add strip_patch method --- Library/Homebrew/os/mac/version.rb | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index 0244607383..389b3d739d 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -78,17 +78,19 @@ module OS end end + sig { returns(T.self_type) } + def strip_patch + # Big Sur is 11.x but Catalina is 10.15.x. + if major >= 11 + self.class.new(major.to_s) + else + major_minor + end + end + sig { returns(Symbol) } def to_sym - @to_sym ||= begin - # Big Sur is 11.x but Catalina is 10.15. - major_macos = if major >= 11 - major - else - major_minor - end.to_s - SYMBOLS.invert.fetch(major_macos, :dunno) - end + @to_sym ||= SYMBOLS.invert.fetch(strip_patch.to_s, :dunno) end sig { returns(String) }