Rearrange things so we restart later

Author: hinerm

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

@@ -107,9 +107,7 @@ class LauncherMigrator {
 	 * <ul>
 	 * <li>If launched with the old ImageJ launcher, call
 	 *   {@link #switchToNewLauncher()}.</li>
-	 * <li>If launched with the new Jaunch launcher, call
-	 *   {@link #migrateShortcuts()} and {@link #migrateUpdateSite()}.</li>
-	 * <li>If launched in some other creative way, do nothing.</li>
+	 * <li>Do nothing if launched with Jaunch or in some other creative way.</li>
 	 * </ul>
 	 */
 	void checkLaunchStatus() {
@@ -124,20 +122,9 @@ void checkLaunchStatus() {
 		// The old launcher does not set the scijava.app.name property.
 		boolean oldLauncherUsed = System.getProperty("scijava.app.name") == null;
 		if (oldLauncherUsed) switchToNewLauncher();
-		else {
-			// FIXME if we change update shortcuts to be windows-style "warn only"
-			// then it's not a problem to do it beforehand.
-			// If we leave as-is then we need to make sure we're instructing the user
-			// to run Help > Update... a second time after restarting to complete the
-			// installation
-			migrateShortcuts();
-			// FIXME if we are doing the actual site toggling here then they will need
-			// to restart again to update. I'd prefer to do it in the switchToNewLauncher
-			// logic. Also, I am curious if having this logic here would *prevent*
-			// a user from using the new launcher with old update sites, which I think
-			// is not intended/desired?
-			migrateUpdateSite();
-		}
+		// NB: it is possible and valid to use Jaunch with the old Fiji update sites
+		// So we do not want to force updating to them just because the new launcher
+		// is being used.
 	}
 
 	/**
@@ -162,9 +149,8 @@ void checkLaunchStatus() {
 	 * OS level rather than potentially exploding at the application level.
 	 * </p>
 	 */
-	private void migrateShortcuts() {
+	private void warnAboutShortcuts() {
 		// If no old launchers are present, assume we already did this.
-		// FIXME: Which launcher(s) should we look for? All platforms? Or current only?
 
 		// Fix links within Linux .desktop files.
 		// ~/.local/share/applications
@@ -395,31 +381,31 @@ private void switchToNewLauncher() {
 			}
 		}
 
-		// All looks good! We can finally relaunch safely with the new launcher.
+		// All looks good!
+		// Switch update sites, and then we can finally relaunch safely with the
+		// new launcher.
+		migrateUpdateSite();
+		warnAboutShortcuts();
 		File exeFile = exeFile(appSlug, appDir);
 		try {
-			Process p = new ProcessBuilder(exeFile.getPath()).start();
-			boolean terminated = p.waitFor(500, TimeUnit.MILLISECONDS);
-			if (terminated || !p.isAlive()) {
-				askForBugReport(log, appTitle, appSlug,
-					new RuntimeException("New launcher terminated unexpectedly"));
-				return;
-			}
-			// New process seems to be up and running; we are done. Whew!
-			startExeRenameProcess(appDir.toPath());
+			startExeRenameAndRestart(appDir.toPath(), exeFile.getAbsolutePath());
 			appService.getContext().dispose();
 			System.exit(0);
 		}
-		catch (IOException | InterruptedException exc) {
+		catch (IOException exc) {
 			askForBugReport(log, appTitle, appSlug, exc);
 		}
 	}
 
 	/**
 	 * Helper method to rename the current exe to a backup version, to discourage
 	 * accidental use of a launcher that is incompatible with Java 21, for example
+	 *
+	 * After deletion, the given exePath is invoked, starting the post-update app
 	 */
-	private static void startExeRenameProcess(Path appDir) throws IOException {
+	private static void startExeRenameAndRestart(Path appDir,
+			String exePath) throws IOException
+	{
 		Path originalExe;
 		if (OS_WIN) {
 			if (ARCH.equals("x32")) {
@@ -464,7 +450,8 @@ private static void startExeRenameProcess(Path appDir) throws IOException {
 					"   Write-Host \"Attempt $tries of " + numTries + " failed...\"; " +
 					"   if ($tries -eq " + numTries + ") { Write-Host 'Max attempts reached. Exiting.'; break; } " +
 					"   Start-Sleep -Milliseconds " + checkIntervalMs + " " +
-					"} }"
+					"} } " +
+					exePath
 			);
 		} else {
 			// Unix/Linux/Mac implementation using bash
@@ -486,9 +473,16 @@ private static void startExeRenameProcess(Path appDir) throws IOException {
 					"   fi; " +
 					"   sleep " + (checkIntervalMs / 1000.0) + "; " +
 					"done"
+					+ exePath
 			);
 		}
 
+		// Write error output to a file if it doesn't exist already
+		File errFile = appDir.resolve("fiji-restart.err").toFile();
+		if (!errFile.exists()) {
+			pb.redirectError(appDir.resolve("fiji-restart.err").toFile());
+		}
+
 		// Redirect process output (optional - for debugging)
 //		pb.redirectOutput(ProcessBuilder.Redirect.INHERIT);
 //		pb.redirectError(ProcessBuilder.Redirect.INHERIT);