From fa0ccdb3ba0a0753a0fc754ec1a8564fffab0713 Mon Sep 17 00:00:00 2001
From: Bo Anderson <mail@boanderson.me>
Date: Mon, 3 Jul 2023 02:52:12 +0100
Subject: [PATCH] cmd/postgresql-upgrade-database: fix brew not being found

---
 Library/Homebrew/cmd/postgresql-upgrade-database.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Library/Homebrew/cmd/postgresql-upgrade-database.rb b/Library/Homebrew/cmd/postgresql-upgrade-database.rb
index e0c2907c97..eae11e79a3 100755
--- a/Library/Homebrew/cmd/postgresql-upgrade-database.rb
+++ b/Library/Homebrew/cmd/postgresql-upgrade-database.rb
@@ -52,7 +52,7 @@ module Homebrew
     old_bin ||= begin
       Formula[old_pg_name]
       ohai "brew install #{old_pg_name}"
-      system "brew", "install", old_pg_name
+      system HOMEBREW_BREW_FILE, "install", old_pg_name
       Pathname.glob(old_pg_glob).first
     rescue FormulaUnavailableError
       nil
@@ -69,11 +69,11 @@ module Homebrew
       # Following instructions from:
       # https://www.postgresql.org/docs/10/static/pgupgrade.html
       ohai "Upgrading #{name} data from #{pg_version_data} to #{pg_version_installed}..."
-      services_json_output = Utils.popen_read("brew", "services", "info", "--all", "--json")
+      services_json_output = Utils.popen_read(HOMEBREW_BREW_FILE, "services", "info", "--all", "--json")
       services_json = JSON.parse(services_json_output)
       loaded_service_names = services_json.select { |sj| sj[:loaded] }.map { |sj| sj[:name] }
       if loaded_service_names.include?(name)
-        system "brew", "services", "stop", name
+        system HOMEBREW_BREW_FILE, "services", "stop", name
         service_stopped = true
       elsif quiet_system "#{bin}/pg_ctl", "-D", datadir, "status"
         system "#{bin}/pg_ctl", "-D", datadir, "stop"
@@ -81,7 +81,7 @@ module Homebrew
       end
 
       # Shut down old server if it is up via brew services
-      system "brew", "services", "stop", old_pg_name if loaded_service_names.include?(old_pg_name)
+      system HOMEBREW_BREW_FILE, "services", "stop", old_pg_name if loaded_service_names.include?(old_pg_name)
 
       # get 'lc_collate' from old DB"
       unless quiet_system "#{old_bin}/pg_ctl", "-w", "-D", datadir, "status"
@@ -143,7 +143,7 @@ module Homebrew
         if server_stopped
           safe_system "#{bin}/pg_ctl", "-D", datadir, "start"
         elsif service_stopped
-          safe_system "brew", "services", "start", name
+          safe_system HOMEBREW_BREW_FILE, "services", "start", name
         end
       else
         onoe "Upgrading #{name} data from #{pg_version_data} to #{pg_version_installed} failed!"
@@ -158,7 +158,7 @@ module Homebrew
         if server_stopped
           system "#{bin}/pg_ctl", "-D", datadir, "start"
         elsif service_stopped
-          system "brew", "services", "start", name
+          system HOMEBREW_BREW_FILE, "services", "start", name
         end
       end
     end