bug fixes

gdbtek · Oct 2, 2023 · b7ea6c7 · b7ea6c7
1 parent c7bcb01
commit b7ea6c7
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/cookbooks/brew/recipes/install.bash b/cookbooks/brew/recipes/install.bash
@@ -11,8 +11,13 @@ function install()
         bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
     fi
 
-    initializeFolder "$('/opt/homebrew/bin/brew' --cache)"
-    displayVersion "$('/opt/homebrew/bin/brew' -v)" 'BREW'
+    if [[ "$(existCommand 'brew')" = 'false' ]]
+    then
+        export PATH="/opt/homebrew/bin:${PATH}"
+    fi
+
+    initializeFolder "$(brew --cache)"
+    displayVersion "$(brew -v)" 'BREW'
 }
 
 function main()

diff --git a/tools/clean-up-brew.bash b/tools/clean-up-brew.bash
@@ -13,9 +13,14 @@ function main()
 
     header 'CLEANING UP BREW'
 
-    '/opt/homebrew/bin/brew' cleanup
-    initializeFolder "$('/opt/homebrew/bin/brew' --cache)"
-    '/opt/homebrew/bin/brew' doctor || true
+    if [[ "$(existCommand 'brew')" = 'false' ]]
+    then
+        export PATH="/opt/homebrew/bin:${PATH}"
+    fi
+
+    brew cleanup
+    initializeFolder "$(brew --cache)"
+    brew doctor || true
 }
 
 main "${@}"
diff --git a/tools/install-brew-applications.bash b/tools/install-brew-applications.bash
@@ -70,17 +70,22 @@ function installBrewPackage()
 
         export HOMEBREW_NO_INSTALL_CLEANUP=FALSE
 
+        if [[ "$(existCommand 'brew')" = 'false' ]]
+        then
+            export PATH="/opt/homebrew/bin:${PATH}"
+        fi
+
         if [[ "${packageType}" = 'cask' ]]
         then
             header "INSTALLING CASK ${packageNameForHeader}"
 
-            '/opt/homebrew/bin/brew' reinstall --"${packageType}" --force "${packageName}" || '/opt/homebrew/bin/brew' install --"${packageType}" --force "${packageName}"
-            displayVersion "$('/opt/homebrew/bin/brew' list --version "${packageName}" --"${packageType}")" "${packageNameForHeader}"
+            brew reinstall --"${packageType}" --force "${packageName}" || brew install --"${packageType}" --force "${packageName}"
+            displayVersion "$(brew list --version "${packageName}" --"${packageType}")" "${packageNameForHeader}"
         else
             header "INSTALLING BREW ${packageNameForHeader}"
 
-            '/opt/homebrew/bin/brew' reinstall --force "${packageName}" || '/opt/homebrew/bin/brew' install --force "${packageName}"
-            displayVersion "$('/opt/homebrew/bin/brew' list --version "${packageName}")" "${packageNameForHeader}"
+            brew reinstall --force "${packageName}" || brew install --force "${packageName}"
+            displayVersion "$(brew list --version "${packageName}")" "${packageNameForHeader}"
         fi
 
         # Post Install

diff --git a/tools/upgrade-brew.bash b/tools/upgrade-brew.bash
@@ -13,9 +13,14 @@ function main()
 
     header 'UPGRADING BREW'
 
-    '/opt/homebrew/bin/brew' update
-    '/opt/homebrew/bin/brew' upgrade
-    '/opt/homebrew/bin/brew' upgrade --cask
+    if [[ "$(existCommand 'brew')" = 'false' ]]
+    then
+        export PATH="/opt/homebrew/bin:${PATH}"
+    fi
+
+    brew update
+    brew upgrade
+    brew upgrade --cask
 
     # Clean Up Brew