formulae: fix

Brewforge · Sep 21, 2024 · 63ad9be · 63ad9be
1 parent 24ef560
commit 63ad9be
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 109 deletions.
diff --git a/Formula/carapace.rb b/Formula/carapace.rb
@@ -3,45 +3,26 @@ class Carapace < Formula
   homepage "https://github.com/carapace-sh/carapace-bin"
   license "MIT"
 
-  on_macos do
-    on_intel do
-      url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_darwin_amd64.tar.gz"
-      sha256 "155683a4b73c2ef8edea701f21fe4a459e9cc009ca9c9115b7bcb3aa002d3f73"
-
-      def install
-        bin.install "carapace"
-      end
-    end
-    on_arm do
-      url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_darwin_arm64.tar.gz"
-      sha256 "b4092699457d92d66026c7f7bb72302cd45ace0dd00bbf49826a2b6bcb24b27c"
-
-      def install
-        bin.install "carapace"
-      end
-    end
+  if OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_darwin_arm64.tar.gz"
+    sha256 "b4092699457d92d66026c7f7bb72302cd45ace0dd00bbf49826a2b6bcb24b27c"
+  elsif OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_darwin_amd64.tar.gz"
+    sha256 "155683a4b73c2ef8edea701f21fe4a459e9cc009ca9c9115b7bcb3aa002d3f73"
+  elsif !OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_linux_arm64.tar.gz"
+    sha256 "62991654a921f2282a83c13ca8c31b5a7df712d401c375f264df6235b4b50efa"
+  elsif !OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_linux_amd64.tar.gz"
+    sha256 "a7441f518a40ffc86d107059699a72c7cc652a03cbc9351f9643247ac25d7b07"
   end
 
-  on_linux do
-    on_intel do
-      if Hardware::CPU.is_64_bit?
-        url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_linux_amd64.tar.gz"
-        sha256 "a7441f518a40ffc86d107059699a72c7cc652a03cbc9351f9643247ac25d7b07"
-
-        def install
-          bin.install "carapace"
-        end
-      end
-    end
-    on_arm do
-      if Hardware::CPU.is_64_bit?
-        url "https://github.com/carapace-sh/carapace-bin/releases/download/v1.0.5/carapace-bin_linux_arm64.tar.gz"
-        sha256 "62991654a921f2282a83c13ca8c31b5a7df712d401c375f264df6235b4b50efa"
+  livecheck do
+    url :homepage
+    strategy :github_latest
+  end
 
-        def install
-          bin.install "carapace"
-        end
-      end
-    end
+  def install
+    bin.install "carapace"
   end
 end
diff --git a/Formula/chatgpt-cli.rb b/Formula/chatgpt-cli.rb
@@ -3,41 +3,22 @@ class ChatgptCli < Formula
   homepage "https://github.com/j178/chatgpt"
   license "MIT"
 
-  on_macos do
-    if Hardware::CPU.arm?
-      url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Darwin_arm64.tar.gz"
-      sha256 "35a8ed4edeabacc61ebf2f020b004546fd25edd3f3f12909e62733fecc5a26be"
+  if OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Darwin_arm64.tar.gz"
+    sha256 "35a8ed4edeabacc61ebf2f020b004546fd25edd3f3f12909e62733fecc5a26be"
+  elsif OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Darwin_x86_64.tar.gz"
+    sha256 "aeb5bd7127a55cf198179cafb1d147de66e3e47e72fbbcaa5d63281c37ecde47"
+  elsif !OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Linux_arm64.tar.gz"
+    sha256 "96c819d5b329c88d9f04cf10ec802eae05a5b9fda77600ed1e4ac213688ae771"
+  elsif !OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Linux_x86_64.tar.gz"
+    sha256 "fb2b78b1d1184e77aadedb02c887e786f4922b8bcaea0ab32d6963d33959b6e3"
 
-      def install
-        bin.install "chatgpt"
-      end
-    end
-    if Hardware::CPU.intel?
-      url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Darwin_x86_64.tar.gz"
-      sha256 "aeb5bd7127a55cf198179cafb1d147de66e3e47e72fbbcaa5d63281c37ecde47"
-
-      def install
-        bin.install "chatgpt"
-      end
-    end
   end
 
-  on_linux do
-    if Hardware::CPU.intel?
-      url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Linux_x86_64.tar.gz"
-      sha256 "fb2b78b1d1184e77aadedb02c887e786f4922b8bcaea0ab32d6963d33959b6e3"
-
-      def install
-        bin.install "chatgpt"
-      end
-    end
-    if Hardware::CPU.arm? && Hardware::CPU.is_64_bit?
-      url "https://github.com/j178/chatgpt/releases/download/v1.3.4/chatgpt_Linux_arm64.tar.gz"
-      sha256 "96c819d5b329c88d9f04cf10ec802eae05a5b9fda77600ed1e4ac213688ae771"
-
-      def install
-        bin.install "chatgpt"
-      end
-    end
+  def install
+    bin.install "chatgpt"
   end
 end
diff --git a/Formula/termscp.rb b/Formula/termscp.rb
@@ -3,26 +3,22 @@ class Termscp < Formula
   homepage "https://termscp.veeso.dev/"
   license "MIT"
 
-  on_macos do
-    on_arm do
-      url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-arm64-apple-darwin.tar.gz"
-      sha256 "6f7537e8451cebd623a712ade9c0e88253bea11d8d1dec2b2016dc1e08bb8a64"
-    end
-    on_intel do
-      url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-x86_64-apple-darwin.tar.gz"
-      sha256 "50fadc30790f35313eb624719c61b59e26ea59155896a2a616cd241414fafc84"
-    end
-  end
+  if OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-arm64-apple-darwin.tar.gz"
+    sha256 "6f7537e8451cebd623a712ade9c0e88253bea11d8d1dec2b2016dc1e08bb8a64"
+
+  elsif OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-x86_64-apple-darwin.tar.gz"
+    sha256 "50fadc30790f35313eb624719c61b59e26ea59155896a2a616cd241414fafc84"
 
-  on_linux do
+  elsif !OS.mac?
     depends_on "dbus"
     depends_on "samba"
-
-    on_arm do
+    if Hardware::CPU.arm?
       url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-aarch64-unknown-linux-gnu.tar.gz"
       sha256 "a55a73e9eb65d6f786a6856aa830d6bdd71b2c4dfa48d3ea4c3feb3f70f2ce5f"
-    end
-    on_intel do
+
+    else
       url "https://github.com/veeso/termscp/releases/latest/download/termscp-v0.13.0-x86_64-unknown-linux-gnu.tar.gz"
       sha256 "20d7cbf182640b333e1c30a0359c036f0e5f636ece51a4d7cdd2f04f9c8166e9"
     end

diff --git a/Formula/wthrr.rb b/Formula/wthrr.rb
@@ -3,33 +3,24 @@ class Wthrr < Formula
   homepage "https://github.com/ttytm/wthrr-the-weathercrab"
   license "MIT"
 
-  on_macos do
-    if Hardware::CPU.arm?
-      url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-macos-arm64"
-      sha256 "ef92e3f9195d39016bc14b40c678d7726e173d484b31e58295e72cde1e8ef383"
-
-      def install
-        bin.install "wthrr-macos-arm64"
-      end
+  if OS.mac? && Hardware::CPU.arm?
+    url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-macos-arm64"
+    sha256 "ef92e3f9195d39016bc14b40c678d7726e173d484b31e58295e72cde1e8ef383"
+    def install
+      bin.install "wthrr-macos-arm64"
     end
-    if Hardware::CPU.intel?
-      url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-macos-x86_64"
-      sha256 "aeb5bd7127a55cf198179cafb1d147de66e3e47e72fbbcaa5d63281c37ecde47"
-
-      def install
-        bin.install "wthrr-macos-x86_64"
-      end
+  elsif OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-macos-x86_64"
+    sha256 "aeb5bd7127a55cf198179cafb1d147de66e3e47e72fbbcaa5d63281c37ecde47"
+    def install
+      bin.install "wthrr-macos-x86_64"
     end
-  end
-
-  on_linux do
-    if Hardware::CPU.intel?
-      url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-linux-x86_64"
-      sha256 "fb2b78b1d1184e77aadedb02c887e786f4922b8bcaea0ab32d6963d33959b6e3"
+  elsif !OS.mac? && !Hardware::CPU.arm?
+    url "https://github.com/ttytm/wthrr-the-weathercrab/releases/download/v1.2.0/wthrr-linux-x86_64"
+    sha256 "fb2b78b1d1184e77aadedb02c887e786f4922b8bcaea0ab32d6963d33959b6e3"
 
-      def install
-        bin.install "wthrr-linux-x86_64"
-      end
+    def install
+      bin.install "wthrr-linux-x86_64"
     end
   end
 end