From 330e0063e15a78afe8f839d398f88511b6737dde Mon Sep 17 00:00:00 2001
From: Sebastian Cohnen <tisba@users.noreply.github.com>
Date: Thu, 23 Nov 2023 19:12:54 +0100
Subject: [PATCH] drops custom homebrew tap

---
 Cargo.toml        |  2 +-
 HomebrewFormula   |  1 -
 README.md         | 17 ++---------------
 pkg/brew/mcfly.rb | 44 --------------------------------------------
 4 files changed, 3 insertions(+), 61 deletions(-)
 delete mode 120000 HomebrewFormula
 delete mode 100644 pkg/brew/mcfly.rb

diff --git a/Cargo.toml b/Cargo.toml
index e9fb324e..6cb4fa2a 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ description = "McFly replaces your default ctrl-r shell history search with an i
 license = "MIT"
 repository = "https://github.com/cantino/mcfly"
 categories = ["command-line-utilities"]
-exclude = ["HomebrewFormula", "HomebrewFormula/*", "pkg/*", "docs/*"]
+exclude = ["docs/*"]
 
 [profile.release]
 lto = true
diff --git a/HomebrewFormula b/HomebrewFormula
deleted file mode 120000
index 1550e7b2..00000000
--- a/HomebrewFormula
+++ /dev/null
@@ -1 +0,0 @@
-./pkg/brew
\ No newline at end of file
diff --git a/README.md b/README.md
index 773384a8..04c38e91 100644
--- a/README.md
+++ b/README.md
@@ -43,13 +43,9 @@ When suggesting a command, McFly takes into consideration:
 
 ### Install with Homebrew (on OS X or Linux)
 
-1. Install the tap:
-    ```bash
-    brew tap cantino/mcfly
-    ```
 1. Install `mcfly`:
     ```bash
-    brew install cantino/mcfly/mcfly
+    brew install mcfly
     ```
 1. Add the following to the end of your `~/.bashrc`, `~/.zshrc`, or `~/.config/fish/config.fish` file:
 
@@ -75,10 +71,6 @@ When suggesting a command, McFly takes into consideration:
     ```bash
     brew uninstall mcfly
     ```
-1. Remove the tap:
-    ```bash
-    brew untap cantino/mcfly
-    ```
 1. Remove the lines you added to `~/.bashrc` / `~/.zshrc` / `~/.config/fish/config.fish`.
 
 ### Install with MacPorts (on OS X)
@@ -382,10 +374,5 @@ Contributions and bug fixes are encouraged! However, we may not merge PRs that i
 1. `git push origin head --tags`
 1. Let the build finish.
 1. Edit the new Release on Github.
-1. Edit `pkg/brew/mcfly.rb` and update the version and SHAs. (`shasum -a 256 ...`)
-1. Edit `../homebrew-mcfly/pkg/brew/mcfly.rb` too.
-  1. `cp pkg/brew/mcfly.rb ../homebrew-mcfly/pkg/brew/mcfly.rb`
-  1. Compare with `diff ../homebrew-mcfly/pkg/brew/mcfly.rb ../mcfly/pkg/brew/mcfly.rb ; diff ../homebrew-mcfly/HomebrewFormula/mcfly.rb ../mcfly/HomebrewFormula/mcfly.rb`
-1. `git add -p && git ci -m 'Update homebrew' && git push`
-1. `cd ../homebrew-mcfly && git add -p && git ci -m 'Update homebrew' && git push && cd ../mcfly`
 1. `cargo publish`
+1. TBD: update homebrew-core Formula at https://github.com/Homebrew/homebrew-core/blob/master/Formula/m/mcfly.rb
diff --git a/pkg/brew/mcfly.rb b/pkg/brew/mcfly.rb
deleted file mode 100644
index 609bbbd1..00000000
--- a/pkg/brew/mcfly.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# To install:
-#   brew tap cantino/mcfly
-#   brew install mcfly
-#
-# To remove:
-#   brew uninstall mcfly
-#   brew untap cantino/mcfly
-
-class Mcfly < Formula
-  version 'v0.8.1'
-  desc "McFly"
-  homepage "https://github.com/cantino/mcfly"
-
-  if OS.mac?
-    url "https://github.com/cantino/mcfly/releases/download/#{version}/mcfly-#{version}-x86_64-apple-darwin.tar.gz"
-    sha256 "db8d125c040fa9f97ba9b7777d1109ff2598db386f42e79e24aef66556500c11"
-  elsif OS.linux?
-    url "https://github.com/cantino/mcfly/releases/download/#{version}/mcfly-#{version}-x86_64-unknown-linux-musl.tar.gz"
-    sha256 "31231a4085f73eef41ab222e08518b7912cce55e7c1396931818a0fbfacf4fef"
-  end
-
-  def install
-    bin.install "mcfly"
-  end
-
-  def caveats
-    <<~EOS
-      ONE MORE STEP!
-
-      Add the following to the end of your ~/.bashrc, ~/.zshrc, or ~/.config/fish/config.fish file.
-
-      Bash:
-        eval "$(mcfly init bash)"
-
-      Zsh:
-        eval "$(mcfly init zsh)"
-
-      Fish:
-        mcfly init fish | source
-
-      You will need to restart your terminal when first installing and on some updates. If you receive a McFly error when running commands, try restarting your terminal.
-    EOS
-  end
-end