From df34386fdeca257f8da4ff74af7a7918d8a8d77e Mon Sep 17 00:00:00 2001
From: Marc <lunij@users.noreply.github.com>
Date: Mon, 1 Nov 2021 20:39:43 +0100
Subject: [PATCH] Rewrite brew.fish

---
 conf.d/brew.fish | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/conf.d/brew.fish b/conf.d/brew.fish
index d86167b..8a39314 100644
--- a/conf.d/brew.fish
+++ b/conf.d/brew.fish
@@ -1,20 +1,17 @@
 set -l brew_paths /opt/homebrew/bin /usr/local/bin /usr/bin /bin /opt/homebrew/sbin /usr/local/sbin /usr/sbin /sbin
 
-# Append all existing brew paths to PATH
-set -l existing_brew_paths
 for brew_path in $brew_paths
-  if test -d $brew_path
-    set PATH $PATH $brew_path
-    set existing_brew_paths $existing_brew_paths $brew_path
+  if contains $brew_path $PATH
+    continue
   end
-end
 
-# Remove brew paths from tail to head that were not recently added
-set -l number_of_paths_to_ignore (math (count $PATH) - (count $existing_brew_paths))
-for i in (seq (count $PATH))[-1..1]
-  if test $i -le $number_of_paths_to_ignore
-    if contains $PATH[$i] $brew_paths
-      set -e PATH[$i]
-    end
+  if test -f $brew_path/brew
+    set brew_found true
+    set PATH $brew_path $PATH
+    break
   end
 end
+
+if not set -q brew_found
+  echo "Please install 'brew' first!"
+end