From 4090e7b540aae4abfd617e6fff5a65c58a59f942 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Sat, 24 Jul 2021 13:14:23 +0200 Subject: [PATCH] Search for homebrew in /opt as well (fixes #496) --- src/main/java/com/replaymod/render/RenderSettings.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/replaymod/render/RenderSettings.java b/src/main/java/com/replaymod/render/RenderSettings.java index d350f5e6..28558f3c 100644 --- a/src/main/java/com/replaymod/render/RenderSettings.java +++ b/src/main/java/com/replaymod/render/RenderSettings.java @@ -334,9 +334,13 @@ public class RenderSettings { } } // Homebrew doesn't seem to reliably symlink its installed binaries either - File homebrewFolder = new File("/usr/local/Cellar/ffmpeg"); - String[] homebrewVersions = homebrewFolder.list(); - if (homebrewVersions != null) { + // and there's multiple locations for where Homebrew is. + for (String path : new String[]{"/usr/local", "/opt/homebrew"}) { + File homebrewFolder = new File(path + "/Cellar/ffmpeg"); + String[] homebrewVersions = homebrewFolder.list(); + if (homebrewVersions == null) { + continue; + } Optional latestOpt = Arrays.stream(homebrewVersions) .map(ComparableVersion::new) // Convert file name to comparable version .sorted(Comparator.reverseOrder()) // Sort for latest version