Revert command/executable name extraction from macOS fallback changes

- Remove the helper methods introduced for extracting command/executable names
  and keep this change focused on adding /opt/homebrew/bin as an additional
  macOS fallback path

Author: froggy-hyun

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

@@ -96,29 +96,25 @@ private Process start(ProcessBuilder processBuilder) throws IOException {
 			if (!Platform.isMac()) {
 				throw ex;
 			}
-			String executableName = getExecutableName(processBuilder.command().get(0));
+			String executable = processBuilder.command().get(0);
 			for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
 				try {
 					List<String> command = new ArrayList<>(processBuilder.command());
-					if (command.get(0).startsWith(binDirectory)) {
+					if (executable.startsWith(binDirectory)) {
 						continue;
 					}
-					command.set(0, binDirectory + executableName);
+					command.set(0, binDirectory + executable);
 					return processBuilder.command(command).start();
 				}
 				catch (Exception suppressed) {
+					// Suppresses the exception and rethrows the original exception
 					ex.addSuppressed(suppressed);
 				}
 			}
 			throw ex;
 		}
 	}
 
-	private String getExecutableName(String executable) {
-		int lastSlash = executable.lastIndexOf('/');
-		return (lastSlash != -1) ? executable.substring(lastSlash + 1) : executable;
-	}
-
 	private static boolean isCredentialsNotFoundError(String message) {
 		return CREDENTIAL_NOT_FOUND_MESSAGES.contains(message.trim());
 	}

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

@@ -102,16 +102,16 @@ void getWhenUnknownErrorThrowsException() {
 	void getWhenExecutableDoesNotExistErrorThrowsException() {
 		String executable = "docker-credential-%s".formatted(UUID.randomUUID().toString());
 		assertThatIOException().isThrownBy(() -> new CredentialHelper(executable).get("invalid.example.com"))
-				.withMessageContaining(executable)
-				.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));
-					}
-				});
+			.withMessageContaining(executable)
+			.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));
+				}
+			});
 	}
 
 }

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

@@ -113,13 +113,12 @@ private Process startProcess(String[] command) {
 		catch (IOException ex) {
 			String path = processBuilder.environment().get("PATH");
 			if (MAC_OS && path != null) {
-				String commandName = getCommandName(command[0]);
 				for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
 					if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
 						continue;
 					}
 					String[] localCommand = command.clone();
-					localCommand[0] = binDirectory + "/" + commandName;
+					localCommand[0] = binDirectory + "/" + command[0];
 					ProcessBuilder localProcessBuilder = new ProcessBuilder(localCommand);
 					localProcessBuilder.directory(this.workingDirectory);
 					try {
@@ -134,11 +133,6 @@ private Process startProcess(String[] command) {
 		}
 	}
 
-	private String getCommandName(String command) {
-		int lastSlash = command.lastIndexOf('/');
-		return (lastSlash != -1) ? command.substring(lastSlash + 1) : command;
-	}
-
 	private int waitForProcess(Process process) {
 		try {
 			return process.waitFor();

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

@@ -77,13 +77,12 @@ private void check(String[] command) {
 		catch (Exception ex) {
 			String path = processBuilder.environment().get("PATH");
 			if (MAC_OS && path != null) {
-				String commandName = getCommandName(command[0]);
 				for (String binDirectory : MAC_OS_BIN_DIRECTORIES) {
 					if (path.contains(binDirectory) || command[0].startsWith(binDirectory + "/")) {
 						continue;
 					}
 					String[] localCommand = command.clone();
-					localCommand[0] = binDirectory + "/" + commandName;
+					localCommand[0] = binDirectory + "/" + command[0];
 					try {
 						check(new ProcessBuilder(localCommand));
 						return;
@@ -104,9 +103,4 @@ private void check(ProcessBuilder processBuilder) throws Exception {
 		process.destroy();
 	}
 
-	private String getCommandName(String command) {
-		int lastSlash = command.lastIndexOf('/');
-		return (lastSlash != -1) ? command.substring(lastSlash + 1) : command;
-	}
-
 }