From 6294c32d20fc2b6da5e6554f691ad3bdfadf9443 Mon Sep 17 00:00:00 2001
From: Amin Yahyaabadi <aminyahyaabadi74@gmail.com>
Date: Sun, 8 Sep 2024 05:22:10 -0700
Subject: [PATCH] fix: fix make gnubin directory on MacOS ARM

---
 packages/setup-brew/src/install.ts | 20 +++++++++++++++-----
 src/make/make.ts                   |  9 ++++++---
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/setup-brew/src/install.ts b/packages/setup-brew/src/install.ts
index 7c9679b3..768f48e4 100644
--- a/packages/setup-brew/src/install.ts
+++ b/packages/setup-brew/src/install.ts
@@ -1,5 +1,5 @@
 import { tmpdir } from "os"
-import { dirname } from "path"
+import { dirname, join } from "path"
 import { type AddPathOptions, addPath } from "envosman"
 import { execaSync } from "execa"
 import { DownloaderHelper } from "node-downloader-helper"
@@ -64,23 +64,33 @@ export async function setupBrew(options: SetupBrewOptions = {}): Promise<Install
   return { binDir }
 }
 
+/**
+ * Get the path to the bin directory of brew
+ * @returns {string} The path where brew binary is installed
+ *
+ * Based on the installation script from https://brew.sh
+ */
+export function getBrewBinDir() {
+  return join(getBrewDir(), "bin")
+}
+
 /**
  * Get the path where brew is installed
  * @returns {string} The path where brew is installed
  *
  * Based on the installation script from https://brew.sh
  */
-export function getBrewBinDir() {
+export function getBrewDir() {
   if (process.platform === "darwin") {
     if (process.arch === "arm64") {
-      return "/opt/homebrew/bin/"
+      return "/opt/homebrew"
     } else {
-      return "/usr/local/bin/"
+      return "/usr/local"
     }
   }
 
   if (process.platform === "linux") {
-    return "/home/linuxbrew/.linuxbrew/bin/"
+    return "/home/linuxbrew/.linuxbrew"
   }
 
   throw new Error("Unsupported platform for brew")
diff --git a/src/make/make.ts b/src/make/make.ts
index e8aeb09d..512089ee 100644
--- a/src/make/make.ts
+++ b/src/make/make.ts
@@ -1,6 +1,7 @@
+import { join } from "path"
 import { addPath } from "envosman"
 import { installAptPack } from "setup-apt"
-import { installBrewPack } from "setup-brew"
+import { getBrewDir, installBrewPack } from "setup-brew"
 import { rcOptions } from "../cli-options.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { isArch } from "../utils/env/isArch.js"
@@ -17,8 +18,10 @@ export async function setupMake(version: string, _setupDir: string, _arch: strin
     }
     case "darwin": {
       await installBrewPack("make", version)
-      await addPath("/usr/local/opt/make/libexec/gnubin", rcOptions)
-      return { binDir: "/usr/local/opt/make/libexec/gnubin" }
+
+      const gnuBinDir = join(getBrewDir(), "opt/make/libexec/gnubin")
+      await addPath(gnuBinDir, rcOptions)
+      return { binDir: gnuBinDir }
     }
     case "linux": {
       if (isArch()) {