From 140718940819f5c5da53b13f6f837bef6007bb77 Mon Sep 17 00:00:00 2001
From: chrnorm <17420369+chrnorm@users.noreply.github.com>
Date: Mon, 31 Jul 2023 17:46:36 +0100
Subject: [PATCH] improve brew alias check

only use the brew prefix if brew is installed
---
 pkg/alias/alias.go | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkg/alias/alias.go b/pkg/alias/alias.go
index 21e0641a..ebb885d0 100644
--- a/pkg/alias/alias.go
+++ b/pkg/alias/alias.go
@@ -10,6 +10,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"strings"
 
 	"github.com/AlecAivazis/survey/v2"
@@ -29,9 +30,10 @@ func init() {
 	_, color.NoColor = os.LookupEnv("NO_COLOR")
 }
 
-const fishAlias = `alias assume="source (brew --prefix)/assume.fish"`
+const fishAlias = `alias assume="source /usr/local/bin/assume.fish"`
+const fishAliasBrew = `alias assume="source (brew --prefix)/assume.fish"`
 const defaultAlias = `alias assume="source assume"`
-const devFishAlias = `alias dassume="source (brew --prefix)/dassume.fish"`
+const devFishAlias = `alias dassume="source /usr/local/bin/dassume.fish"`
 const devDefaultAlias = `alias dassume="source dassume"`
 
 func GetDefaultAlias() string {
@@ -44,6 +46,13 @@ func GetFishAlias() string {
 	if build.IsDev() {
 		return devFishAlias
 	}
+
+	// if 'brew' exists on the path, use the brew prefix rather than /usr/local/bin when installing the alias.
+	// chrnorm: there's not really a better way to determine if we've been installed with brew or not.
+	if _, err := exec.LookPath("brew"); err == nil {
+		return fishAliasBrew
+	}
+
 	return fishAlias
 }