From d80aaf766db7fed84a5a4bce0d2b1619c6282f0a Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sun, 16 Jun 2019 10:07:20 +0200
Subject: HomebrewFormula: Fix `:lion`/"10.7" `depends_on`

Turns out we didn't solve the problem with the previous commit, as
"10.7" still needs to be in Homebrew's `MacOS::Version::SYMBOLS` hash in
order to be recognised.

To work around this, depend on Lion if Homebrew provides it, otherwise
display a message in the Caveats section about the minimum OS version.
---
 HomebrewFormula/dome-key.rb | 13 +++++++++++--
 pkg/dome-key.in.rb          | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/HomebrewFormula/dome-key.rb b/HomebrewFormula/dome-key.rb
index 73beb47..7a5c106 100644
--- a/HomebrewFormula/dome-key.rb
+++ b/HomebrewFormula/dome-key.rb
@@ -6,7 +6,16 @@ class DomeKey < Formula
   sha256 "03fd038e1ae67ce1fce949d2d5fcafb50bbee2f4344b71c16577929c557718a1"
 
   # Rust code requires at least 10.7
-  depends_on :macos => "10.7"
+  depends_on :macos => :lion if MacOS::Version::SYMBOLS.has_key?(:lion)
+
+  def minimum_os
+    return "" if MacOS::Version::SYMBOLS.has_key?(:lion)
+
+    <<~EOS
+      DomeKey requires Mac OS X 10.7 Lion or later.
+
+    EOS
+  end
 
   def install
     bin.install "dome-key"
@@ -19,7 +28,7 @@ class DomeKey < Formula
   end
 
   def caveats; <<~EOS
-    To get started with a set of mappings, try running the these commands:
+    #{minimum_os}To get started with a set of mappings, try running the these commands:
 
         mkdir -p $HOME/.config/dome-key
         cat <<EOM > $HOME/.config/dome-key/mappings.dkmap
diff --git a/pkg/dome-key.in.rb b/pkg/dome-key.in.rb
index 7582e34..736e7a5 100644
--- a/pkg/dome-key.in.rb
+++ b/pkg/dome-key.in.rb
@@ -6,7 +6,16 @@ class DomeKey < Formula
   sha256 "${SHA256}"
 
   # Rust code requires at least 10.7
-  depends_on :macos => "10.7"
+  depends_on :macos => :lion if MacOS::Version::SYMBOLS.has_key?(:lion)
+
+  def minimum_os
+    return "" if MacOS::Version::SYMBOLS.has_key?(:lion)
+
+    <<~EOS
+      DomeKey requires Mac OS X 10.7 Lion or later.
+
+    EOS
+  end
 
   def install
     bin.install "dome-key"
@@ -19,7 +28,7 @@ class DomeKey < Formula
   end
 
   def caveats; <<~EOS
-    To get started with a set of mappings, try running the these commands:
+    #{minimum_os}To get started with a set of mappings, try running the these commands:
 
         mkdir -p $$HOME/.config/dome-key
         cat <<EOM > $$HOME/.config/dome-key/mappings.dkmap
-- 
cgit v1.2.3