Skip to content

Commit 6c707c5

Browse files
committed
Update Jaunch-based macOS launcher locations
They now reside beneath Fiji.app. But keep recognizing the old locations too for backward compatibility.
1 parent d120e11 commit 6c707c5

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

src/main/java/net/imagej/updater/util/UpdaterUtil.java

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,12 @@ public class UpdaterUtil {
107107
static {
108108
launcherToPlatform = new HashMap<>();
109109
// Jaunch: https://github.com/apposed/jaunch
110-
launcherToPlatform.put("Contents/MacOS/fiji-macos", "macos-arm64");
111-
launcherToPlatform.put("Contents/MacOS/fiji-macos-arm64", "macos-arm64");
112-
launcherToPlatform.put("Contents/MacOS/fiji-macos-universal", "macos-arm64");
113-
launcherToPlatform.put("Contents/MacOS/fiji-macos-x64", "macosx");
114-
launcherToPlatform.put("Contents/MacOS/jaunch-macos", "macos-arm64");
115-
launcherToPlatform.put("Contents/MacOS/jaunch-macos-arm64", "macos-arm64");
116-
launcherToPlatform.put("Contents/MacOS/jaunch-macos-x64", "macosx");
117-
launcherToPlatform.put("Contents/MacOS/jaunch-macos-universal", "macos-arm64");
110+
launcherToPlatform.put("Fiji.app/Contents/MacOS/fiji-macos", "macos-arm64,macosx");
111+
launcherToPlatform.put("Fiji.app/Contents/MacOS/fiji-macos-arm64", "macos-arm64");
112+
launcherToPlatform.put("Fiji.app/Contents/MacOS/fiji-macos-x64", "macosx");
113+
launcherToPlatform.put("Fiji.app/Contents/MacOS/jaunch-macos", "macos-arm64,macosx");
114+
launcherToPlatform.put("Fiji.app/Contents/MacOS/jaunch-macos-arm64", "macos-arm64");
115+
launcherToPlatform.put("Fiji.app/Contents/MacOS/jaunch-macos-x64", "macosx");
118116
launcherToPlatform.put("fiji-linux-arm64", "linux-arm64");
119117
launcherToPlatform.put("fiji-linux-x64", "linux64");
120118
launcherToPlatform.put("fiji-windows-arm64.exe", "win-arm64");
@@ -123,6 +121,17 @@ public class UpdaterUtil {
123121
launcherToPlatform.put("config/jaunch/jaunch-linux-x64", "linux64");
124122
launcherToPlatform.put("config/jaunch/jaunch-windows-arm64.exe", "win-arm64");
125123
launcherToPlatform.put("config/jaunch/jaunch-windows-x64.exe", "win64");
124+
// Jaunch but deprecated
125+
launcherToPlatform.put("Contents/MacOS/fiji-macos", "macos-arm64,macosx");
126+
launcherToPlatform.put("Contents/MacOS/fiji-macos-arm64", "macos-arm64");
127+
launcherToPlatform.put("Contents/MacOS/fiji-macos-universal", "macos-arm64,macosx");
128+
launcherToPlatform.put("Contents/MacOS/fiji-macos-x64", "macosx");
129+
launcherToPlatform.put("Contents/MacOS/jaunch-macos", "macos-arm64");
130+
launcherToPlatform.put("Contents/MacOS/jaunch-macos-arm64", "macos-arm64");
131+
launcherToPlatform.put("Contents/MacOS/jaunch-macos-universal", "macos-arm64");
132+
launcherToPlatform.put("Contents/MacOS/jaunch-macos-x64", "macosx");
133+
launcherToPlatform.put("Fiji.app/Contents/MacOS/fiji-macos-universal", "macos-arm64,macosx");
134+
launcherToPlatform.put("Fiji.app/Contents/MacOS/jaunch-macos-universal", "macos-arm64");
126135
// ImageJ Launcher: https://github.com/imagej/imagej-launcher
127136
launcherToPlatform.put("ImageJ-linux32", "linux32");
128137
launcherToPlatform.put("ImageJ-linux64", "linux64");

0 commit comments

Comments
 (0)