WIP: more warning

Author: hinerm

src/main/java/net/imagej/ui/swing/updater/LauncherMigrator.java

@@ -128,29 +128,36 @@ void checkLaunchStatus() {
 	}
 
 	/**
-	 * Updates platform-specific shortcuts to reference the new launcher,
-	 * including {@code .desktop} files on Linux.
+	 * Warns users to update any shortcuts to reference the new launcher.
+	 * Currently, this is recommended to be done manually.
 	 * <p>
 	 * The macOS-specific {@code Contents/Info.plist} is handled separately
 	 * by the Updater, as part of the switch to the new update site; see
 	 * {@link #migrateUpdateSite()}.
 	 * </p>
-	 * <p></p>
-	 * Windows users are advised to update their shortcuts by hand, because:
+	 * <p>
+	 * Linux users need to change any {@code .desktop} files.
+	 * </p>
+	 * <p>
+	 * Windows is particularly complicated, because:
 	 * A) we don't know where the user put their Fiji shortcuts&mdash;they
 	 * could be in the Start menu, on the desktop, or elsewhere and pinned
 	 * to the taskbar; and B) the .lnk file format is an opaque binary
 	 * format and I'm not going to code up something to hack it just for
 	 * this transitional migration code that will be obsolete in a few months.
 	 * </p>
 	 * <p>
-	 * Finally, old launchers are renamed with {@code .backup} extension in
+	 * Note that launchers will be renamed with the {@code .backup} extension in
 	 * case there are any missed shortcuts, so that launch fails fast at the
-	 * OS level rather than potentially exploding at the application level.
+	 * OS level rather than potentially exploding at the application level; see
+	 * {@link #startExeRenameAndRestart(Path, String)}
 	 * </p>
 	 */
-	private void warnAboutShortcuts() {
-		// If no old launchers are present, assume we already did this.
+	private void warnAboutShortcuts(File exeFile) {
+
+		// FIXME warn users on all platforms not just windows and use the exe file to
+		// tell them the new executable name
+
 
 		// Fix links within Linux .desktop files.
 		// ~/.local/share/applications
@@ -164,8 +171,6 @@ private void warnAboutShortcuts() {
 		// one of these files is fiji/fiji/scripts/Plugins/Utilities/Create_Desktop_Icon.bsh,
 		// but it's outdated. So what is making these files these days??
 
-		// TODO On MAC, Fiji.app is now a subdir of Fiji.. may want to rename the
-		// top level Fiji.app to Fiji.
 		if (OS_WIN) {
 			// FIXME: Warn user to update any shortcuts!
 			uiService.showDialog(
@@ -385,8 +390,8 @@ private void switchToNewLauncher() {
 		// Switch update sites, and then we can finally relaunch safely with the
 		// new launcher.
 		migrateUpdateSite();
-		warnAboutShortcuts();
 		File exeFile = exeFile(appSlug, appDir);
+		warnAboutShortcuts(exeFile);
 		try {
 			startExeRenameAndRestart(appDir.toPath(), exeFile.getAbsolutePath());
 			appService.getContext().dispose();
@@ -455,6 +460,7 @@ private static void startExeRenameAndRestart(Path appDir,
 			);
 		} else {
 			// Unix/Linux/Mac implementation using bash
+			// FIXME On MAC, Fiji.app is now a subdir of Fiji.. also rename the top level Fiji.app to Fiji
 			pb = new ProcessBuilder(
 					"bash",
 					"-c",