DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Search for homebrew in /opt as well (fixes #496)

Browse Source
This commit is contained in:
Jonas Herzig
2021-07-24 13:14:23 +02:00
parent 2891c4e8fa
commit 4090e7b540
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/replaymod/render/RenderSettings.java
View File

@@ -334,9 +334,13 @@ public class RenderSettings {
} }
} }
// Homebrew doesn't seem to reliably symlink its installed binaries either // Homebrew doesn't seem to reliably symlink its installed binaries either
File homebrewFolder = new File("/usr/local/Cellar/ffmpeg"); // and there's multiple locations for where Homebrew is.
String[] homebrewVersions = homebrewFolder.list(); for (String path : new String[]{"/usr/local", "/opt/homebrew"}) {
if (homebrewVersions != null) { File homebrewFolder = new File(path + "/Cellar/ffmpeg");
String[] homebrewVersions = homebrewFolder.list();
if (homebrewVersions == null) {
continue;
}
Optional<File> latestOpt = Arrays.stream(homebrewVersions) Optional<File> latestOpt = Arrays.stream(homebrewVersions)
.map(ComparableVersion::new) // Convert file name to comparable version .map(ComparableVersion::new) // Convert file name to comparable version
.sorted(Comparator.reverseOrder()) // Sort for latest version .sorted(Comparator.reverseOrder()) // Sort for latest version