Try some maven startup tweaks (#79 improves #44)

equodev · Feb 13, 2023 · e78a22e · e78a22e
2 parents e532426 + 622cf13
commit e78a22e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/plugin-maven/CHANGELOG.md b/plugin-maven/CHANGELOG.md
@@ -3,7 +3,11 @@
 We adhere to the [keepachangelog](https://keepachangelog.com/en/1.0.0/) format.
 
 ## [Unreleased]
-
+### Fixed
+- More attempts to improve maven IDE launch experience. ([#79](https://github.com/equodev/equo-ide/pull/79) fixes [#44](https://github.com/equodev/equo-ide/issues/44))
+  - mac already works great
+  - linux now has a `sleep 5`
+  - windows now has a visible cmd prompt console
 ## [0.13.1] - 2023-02-12
 ### Fixed
 - No more errors on filesystems which don't support atomic move. ([#73](https://github.com/equodev/equo-ide/pull/73))

diff --git a/plugin-maven/src/main/java/dev/equo/ide/maven/LaunchMojo.java b/plugin-maven/src/main/java/dev/equo/ide/maven/LaunchMojo.java
@@ -13,6 +13,7 @@
  *******************************************************************************/
 package dev.equo.ide.maven;
 
+import com.diffplug.common.swt.os.OS;
 import dev.equo.ide.BuildPluginIdeMain;
 import dev.equo.ide.IdeHook;
 import dev.equo.ide.IdeHookBranding;
@@ -139,6 +140,9 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 				ideHooks.add(welcomeHook);
 			}
 
+			if (!OS.getNative().isMac()) {
+				System.setProperty("equo-ide-maven-workarounds", "true");
+			}
 			caller.ideHooks = ideHooks;
 			caller.classpath = files;
 			caller.debugClasspath = debugClasspath;

diff --git a/solstice/src/main/java/dev/equo/ide/Launcher.java b/solstice/src/main/java/dev/equo/ide/Launcher.java
@@ -87,8 +87,8 @@ public static int launchAndInheritIO(
 			builder.directory(cwd);
 		}
 		var process = builder.start();
-		var outPumper = new StreamPumper(process.getInputStream(), System.out);
-		var errPumper = new StreamPumper(process.getErrorStream(), System.err);
+		var outPumper = new StreamPumper(process, process.getInputStream(), System.out);
+		var errPumper = new StreamPumper(process, process.getErrorStream(), System.err);
 		if (monitorProcess != null) {
 			new Thread(
 							() -> {
@@ -104,10 +104,12 @@ public static int launchAndInheritIO(
 	}
 
 	static class StreamPumper extends Thread {
+		private final Process process;
 		private final InputStream in;
 		private final PrintStream out;
 
-		private StreamPumper(InputStream in, PrintStream out) {
+		private StreamPumper(Process process, InputStream in, PrintStream out) {
+			this.process = process;
 			this.in = in;
 			this.out = out;
 			start();
@@ -123,7 +125,10 @@ public void run() {
 					out.flush();
 				}
 			} catch (IOException e) {
-				throw new RuntimeException(e);
+				if (process.isAlive()) {
+					// only report the exception if the process is alive
+					throw new RuntimeException(e);
+				}
 			}
 		}
 	}

diff --git a/solstice/src/main/java/dev/equo/ide/ScriptExec.java b/solstice/src/main/java/dev/equo/ide/ScriptExec.java
@@ -76,6 +76,10 @@ private void exec(boolean isSeparate, @Nullable Consumer<Process> monitorProcess
 		}
 	}
 
+	private static boolean mavenWorkarounds() {
+		return "true".equals(System.getProperty("equo-ide-maven-workarounds"));
+	}
+
 	/** The integer value which marks that a process exited successfully. */
 	private static final int EXIT_VALUE_SUCCESS = 0;
 
@@ -167,7 +171,11 @@ private static List<String> getPlatformCmds(File scriptFile, boolean isSeparate)
 			// use sh to execute
 			if (isSeparate) {
 				File spawningScript =
-						createSelfDeletingScript("nohup " + quote(scriptFile) + " &" + "\n" + "disown");
+						createSelfDeletingScript(
+								""
+										+ ("nohup " + quote(scriptFile) + " &\n")
+										+ (mavenWorkarounds() ? "sleep 5\n" : "")
+										+ "disown\n");
 				return List.of("/bin/bash", spawningScript.getAbsolutePath());
 			} else {
 				return List.of("/bin/bash", scriptFile.getAbsolutePath());
@@ -181,7 +189,7 @@ private static File createInvisibleVbs(boolean isSeparate) throws IOException {
 				".vbs",
 				(file, printer) -> {
 					// args are at http://ss64.com/vb/run.html
-					String windowStyle = "0";
+					String windowStyle = mavenWorkarounds() ? "1" : "0";
 					String waitOnReturn = isSeparate ? "False" : "True";
 					// open the shell
 					printer.println(