Redetermine curl and git paths where necessary

[Bo98]

• Have you followed the guidelines in our Contributing document?
• Have you checked to ensure there aren't other open Pull Requests for the same change?
• Have you added an explanation of what your changes do and why you'd like us to include them?
• Have you written new tests for your changes? Here's an example.
• Have you successfully run brew style with your changes locally?
• Have you successfully run brew typecheck with your changes locally?
• Have you successfully run brew tests with your changes locally?

---

Discovered while testing an installation of Homebrew in a 10.10 VM.

We need to redetermine the curl and git paths in two places:

• After OS conditionals where we may force HOMEBREW_FORCE_BREWED_CURL/GIT.
• After installing curl and git in brew update, so the rest of the update script can use them.

[MikeMcQuaid]

Looks good, makes sense.

[BrewTestBot]

Review period skipped due to critical label.

[carlocab]

This now shows up in brew config:

Git: 2.33.0 => /opt/homebrew/opt/git/bin/git
Curl: 7.64.1 => /opt/homebrew/Library/Homebrew/shims/shared/curl

Should we be exposing the path to the shims like this? Interestingly, the path to git is determined correctly.

[MikeMcQuaid]

Should we be exposing the path to the shims like this?

No, I don't think so.

Interestingly, the path to git is determined correctly.

That's likely because we're doing something smarter there.

[carlocab]

Yep. This is where the path to curl is determined:

brew/Library/Homebrew/system_config.rb

Lines 129 to 137 in 92749f9

	def describe_curl
	out, = system_command(curl_executable, args: ["--version"], verbose: false)
	if /^curl (?<curl_version>[\d.]+)/ =~ out
	"#{curl_version} => #{curl_executable}"
	else
	"N/A"
	end
	end

and this is curl_executable:

brew/Library/Homebrew/utils/curl.rb

Lines 19 to 23 in 92749f9

	def curl_executable(use_homebrew_curl: false)
	return Formula["curl"].opt_bin/"curl" if use_homebrew_curl
	@curl_executable ||= HOMEBREW_SHIMS_PATH/"shared/curl"
	end

I'll have a look tomorrow.

[carlocab]

#12198