Merge pull request #3 from tpietzsch/macos-fixes

Macos fixes
apposed · Apr 18, 2024 · 9a0c7bf · 9a0c7bf
2 parents eb899b4 + 2c616f7
commit 9a0c7bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/org/apposed/appose/Environment.java b/src/main/java/org/apposed/appose/Environment.java
@@ -57,7 +57,7 @@ public interface Environment {
 	 */
 	default Service python() throws IOException {
 		List<String> pythonExes = Arrays.asList(
-			"python", "python.exe",
+			"python", "python3", "python.exe",
 			"bin/python", "bin/python.exe"
 		);
 		return service(pythonExes, "-c",

diff --git a/src/main/java/org/apposed/appose/FilePaths.java b/src/main/java/org/apposed/appose/FilePaths.java
@@ -72,7 +72,7 @@ public static File findExe(List<String> dirs, List<String> exes) {
 				// Candidate is a relative path; check beneath each given directory.
 				for (String dir : dirs) {
 					File f = Paths.get(dir, exe).toFile();
-					if (f.canExecute()) return f;
+					if (f.canExecute() && !f.isDirectory()) return f;
 				}
 			}
 		}

diff --git a/src/test/java/org/apposed/appose/ApposeTest.java b/src/test/java/org/apposed/appose/ApposeTest.java
@@ -95,7 +95,7 @@ public void testServiceStartupFailure() throws IOException {
 		catch (IllegalArgumentException exc) {
 			assertEquals(
 				"No executables found amongst candidates: " +
-				"[python, python.exe, bin/python, bin/python.exe]",
+				"[python, python3, python.exe, bin/python, bin/python.exe]",
 				exc.getMessage()
 			);
 		}