Polish "Add support for additional Homebrew home on macOS"

See gh-49721

Author: snicoll

buildpack/spring-boot-buildpack-platform/src/main/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelper.java

@@ -96,18 +96,15 @@ private Process start(ProcessBuilder processBuilder) throws IOException {
 			if (!Platform.isMac()) {
 				throw ex;
 			}
-			String executable = processBuilder.command().get(0);
+			List<String> originalCommand = List.copyOf(processBuilder.command());
+			String executable = originalCommand.get(0);
 			for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
+				List<String> command = new ArrayList<>(originalCommand);
+				command.set(0, binDirectory + executable);
 				try {
-					List<String> command = new ArrayList<>(processBuilder.command());
-					if (executable.startsWith(binDirectory)) {
-						continue;
-					}
-					command.set(0, binDirectory + executable);
 					return processBuilder.command(command).start();
 				}
 				catch (Exception suppressed) {
-					// Suppresses the exception and rethrows the original exception
 					ex.addSuppressed(suppressed);
 				}
 			}

buildpack/spring-boot-buildpack-platform/src/test/java/org/springframework/boot/buildpack/platform/docker/configuration/CredentialHelperTests.java

@@ -106,10 +106,11 @@ void getWhenExecutableDoesNotExistErrorThrowsException() {
 			.satisfies((ex) -> {
 				if (Platform.isMac()) {
 					assertThat(ex.getMessage()).doesNotContain("/usr/local/bin/");
-					assertThat(ex.getSuppressed()).anySatisfy((suppressed) -> assertThat(suppressed)
-						.hasMessageContaining("/opt/homebrew/bin/" + executable));
-					assertThat(ex.getSuppressed()).anySatisfy((suppressed) -> assertThat(suppressed)
-						.hasMessageContaining("/usr/local/bin/" + executable));
+					assertThat(ex.getSuppressed()).satisfiesExactlyInAnyOrder(
+							(suppressed) -> assertThat(suppressed)
+								.hasMessageContaining("/opt/homebrew/bin/" + executable),
+							(suppressed) -> assertThat(suppressed)
+								.hasMessageContaining("/usr/local/bin/" + executable));
 				}
 			});
 	}

core/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/core/ProcessRunner.java

@@ -114,7 +114,7 @@ private Process startProcess(String[] command) {
 			String path = processBuilder.environment().get("PATH");
 			if (MAC_OS && path != null) {
 				for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
-					if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
+					if (path.contains(binDirectory) || command[0].startsWith("/")) {
 						continue;
 					}
 					String[] localCommand = command.clone();

test-support/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/process/DisabledIfProcessUnavailableCondition.java

@@ -78,7 +78,7 @@ private void check(String[] command) {
 			String path = processBuilder.environment().get("PATH");
 			if (MAC_OS && path != null) {
 				for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
-					if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
+					if (path.contains(binDirectory) || command[0].startsWith("/")) {
 						continue;
 					}
 					String[] localCommand = command.clone();
@@ -87,7 +87,8 @@ private void check(String[] command) {
 						check(new ProcessBuilder(localCommand));
 						return;
 					}
-					catch (Exception ignored) {
+					catch (Exception suppressed) {
+						ex.addSuppressed(suppressed);
 					}
 				}
 			}