From edb253a272e3f98333fd6ce44ab1829d94f06449 Mon Sep 17 00:00:00 2001
From: Paul Brown <67805647+pb-dod@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:52:11 -0500
Subject: [PATCH] bump rancher 1.12.2 to 1.13.1 (fixes qemu on m3 mac) (#88)

Release notes:
https://github.com/rancher-sandbox/rancher-desktop/releases/tag/v1.13.1

This also helps us get rid of some of the hacks we had to add to support
m3 mac.
---
 Casks/ih-rancher.rb      |  6 +++---
 VERSION                  |  2 +-
 formula/ih-core.rb       |  2 +-
 lib/core/rancher/step.sh | 25 -------------------------
 lib/utils/arch.sh        |  5 -----
 5 files changed, 5 insertions(+), 35 deletions(-)

diff --git a/Casks/ih-rancher.rb b/Casks/ih-rancher.rb
index 56d5005..aa2b315 100644
--- a/Casks/ih-rancher.rb
+++ b/Casks/ih-rancher.rb
@@ -1,12 +1,12 @@
 cask "ih-rancher" do
-    version "1.12.2"
+    version "1.13.1"
 
     if Hardware::CPU.intel?
         url "https://github.com/rancher-sandbox/rancher-desktop/releases/download/v#{version}/Rancher.Desktop-#{version}.x86_64.dmg"
-        sha256 "299034631ee0faa747f55b2ca7d6682419a15563a706ef8a2415e8638108fd35"
+        sha256 "75a5532f5d2332f07a556c75455367c26954471de5d4ba436f9ab4aa3b309ac2"
     else
         url "https://github.com/rancher-sandbox/rancher-desktop/releases/download/v#{version}/Rancher.Desktop-#{version}.aarch64.dmg"
-        sha256 "9ab8131239a34ff880b79617f71254a502fb30a3dd7908b13533b84e9698a499"
+        sha256 "7334e2246c8e0d015733697f9bc9abae18973296671595f6b9e039870d327388"
     end
 
     name "Rancher Desktop"
diff --git a/VERSION b/VERSION
index 352e98e..0665a48 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.1.49
+0.1.50
diff --git a/formula/ih-core.rb b/formula/ih-core.rb
index a6bf47e..bee1f0e 100644
--- a/formula/ih-core.rb
+++ b/formula/ih-core.rb
@@ -1,5 +1,5 @@
 class IhCore < Formula
-  VERSION="0.1.49"
+  VERSION="0.1.50"
   desc "Brew formula for installing core tools used at Included Health engineering."
   homepage "https://github.com/ConsultingMD/homebrew-ih-public"
   license "CC BY-NC-ND 4.0"
diff --git a/lib/core/rancher/step.sh b/lib/core/rancher/step.sh
index b473f62..26c9bb1 100644
--- a/lib/core/rancher/step.sh
+++ b/lib/core/rancher/step.sh
@@ -49,19 +49,6 @@ function ih::setup::core.rancher::test() {
     return 1
   fi
 
-  # Use vz (requires macOS >=13.3) instead of qemu on M3 macs to resolve issues.
-  # More details: https://github.com/lima-vm/lima/issues/1996
-  local macos_version=$(ih::arch::get_macos_version)
-  if ih::arch::is_m3_mac; then
-    if (( $(echo "$macos_version < 13.3" | bc -l) )); then
-      ih::log::error "macOS version 13.3 or higher is required for M3 Macs."
-      return 1
-    elif ! grep -q "<string>vz</string>" "$PLIST_DST"; then
-      ih::log::debug "The PLIST file needs to be updated to use 'vz' for M3 Macs."
-      return 1
-    fi
-  fi
-
   return 0
 }
 
@@ -157,18 +144,6 @@ function ih::setup::core.rancher::install() {
       fi
     fi
 
-    # Use vz (requires macOS >=13.3) instead of qemu on M3 macs to resolve issues.
-    # More details: https://github.com/lima-vm/lima/issues/1996
-    if ih::arch::is_m3_mac; then
-      if (( $(echo "$macos_version < 13.3" | bc -l) )); then
-        ih::log::error "macOS version 13.3 or higher is required for M3 Macs."
-        return 1 # Abort the installation for M3 Macs
-      elif ! grep -q "<string>vz</string>" "$PLIST_DST"; then
-        ih::log::debug "Updating PLIST to use 'vz' for Virtualization for M3 Macs."
-        sudo sed -i '' 's/<string>qemu<\/string>/<string>vz<\/string>/g' "$PLIST_DST"
-      fi
-    fi
-
     echo "Rancher Desktop has been installed successfully"
   else
     ih::log::warn "Could not install Rancher Desktop"
diff --git a/lib/utils/arch.sh b/lib/utils/arch.sh
index b479880..65589bd 100644
--- a/lib/utils/arch.sh
+++ b/lib/utils/arch.sh
@@ -25,8 +25,3 @@ ih::arch::mbrew() {
 ih::arch::get_macos_version() {
   sw_vers -productVersion | awk -F '.' '{ printf("%d.%d\n", $1, $2) }'
 }
-
-ih::arch::is_m3_mac() {
-  local hw_model=$(sysctl -n machdep.cpu.brand_string)
-  [[ "$hw_model" == *"M3"* ]]
-}