Fixed updater

Author: Lassebq

src/main/java/org/mcphackers/mcp/MCP.java

@@ -4,18 +4,16 @@
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.AnsiConsole;
 import org.mcphackers.mcp.tasks.info.TaskInfo;
-import org.mcphackers.mcp.tools.Util;
 import org.mcphackers.mcp.tools.VersionsParser;
 
 import java.io.IOException;
-import java.net.URISyntaxException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
 
 public class MCP {
 
-	public static final String VERSION = "Test";
+	public static final String VERSION = "v0.2";
     public static EnumMode mode = null;
     public static EnumMode helpCommand = null;
     public static MCPLogger logger;
@@ -31,31 +29,22 @@ public class MCP {
             .fgCyan().a(" |_|  \\_\\___|\\__|_|  \\___/").fgYellow().a("|_|  |_|\\_____|_|     ").a('\n')
             .fgDefault();
 
-    private static boolean checkIfUpdating(String[] args) throws URISyntaxException, IOException {
-    	System.out.println(Paths.get(MCP.class
-			          .getProtectionDomain()
-			          .getCodeSource()
-			          .getLocation()
-			          .toURI()));
-    	if(args.length >= 2) {
-			if(args[0].equals("update")) {
-				Files.deleteIfExists(Paths.get(args[1]));
-				Files.copy(Paths.get(MCPConfig.UPDATE_JAR), Paths.get(args[1]));
-				Util.runCommand(new String[] {
-					Util.getJava(),
-					"-jar",
-					args[1]
-				});
+	private static void attemptToDeleteUpdateJar() {
+		long startTime = System.currentTimeMillis();
+		boolean keepTrying = true;
+		while(keepTrying) {
+			try {
+				Files.deleteIfExists(Paths.get(MCPConfig.UPDATE_JAR));
+				keepTrying = false;
+			} catch (IOException e) {
+				keepTrying = System.currentTimeMillis() - startTime < 10000;
 			}
-			return true;
-    	}
-		return false;
+		}
 	}
 
     public static void main(String[] args) throws Exception {
     	SelfCommandPrompt.runWithCMD(SelfCommandPrompt.suggestAppId(), "RetroMCP " + VERSION, args);
-    	if(checkIfUpdating(args)) System.exit(0);
-		//Files.deleteIfExists(Paths.get(MCPConfig.UPDATE_JAR));
+		attemptToDeleteUpdateJar();
     	AnsiConsole.systemInstall();
         logger = new MCPLogger();
         config = new MCPConfig();

src/main/java/org/mcphackers/mcp/Update.java

@@ -0,0 +1,31 @@
+package org.mcphackers.mcp;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import org.mcphackers.mcp.tools.Util;
+
+public class Update {
+	
+	public static void main(String[] args) {
+    	if(args.length >= 1) {
+    		boolean keepTrying = true;
+    		long startTime = System.currentTimeMillis();
+    		while(keepTrying) {
+				try {
+					Files.deleteIfExists(Paths.get(args[0]));
+					Files.copy(Paths.get(MCPConfig.UPDATE_JAR), Paths.get(args[0]));
+					Util.runCommand(new String[] {
+						Util.getJava(),
+						"-jar",
+						args[0]
+					});
+					keepTrying = false;
+				} catch (IOException e) {
+					keepTrying = System.currentTimeMillis() - startTime < 10000;
+				}
+    		}
+    	}
+	}
+}

src/main/java/org/mcphackers/mcp/tasks/TaskDownloadUpdate.java

@@ -41,10 +41,9 @@ public void doTask() throws Exception {
 						continue;
 					}
 					FileUtil.downloadFile(new URL(assetObj.getString("browser_download_url")), Paths.get(MCPConfig.UPDATE_JAR));
-					//if(!Files.exists(Paths.get(MCPConfig.UPDATE_JAR)))Files.copy(Paths.get("test.jar"), Paths.get(MCPConfig.UPDATE_JAR));
 				}
 			}
-			MCP.logger.info("Press return key to continue");
+			MCP.logger.info("Press ENTER key to continue");
 			MCP.input.nextLine();
 			Path jarPath = Paths.get(MCP.class
 			          .getProtectionDomain()
@@ -54,9 +53,9 @@ public void doTask() throws Exception {
 			if(!Files.isDirectory(jarPath)) {
 				String[] cmd = new String[] {
 					Util.getJava(),
-					"-jar",
+					"-cp",
 					MCPConfig.UPDATE_JAR,
-					"update",
+					"org.mcphackers.mcp.Update",
 					jarPath.toString()
 				};
 				Util.runCommand(cmd);

src/main/java/org/mcphackers/mcp/tools/Util.java

@@ -51,9 +51,7 @@ public void run() {
 
     public static void runCommand(String[] cmd) throws IOException {
         ProcessBuilder procBuilder = new ProcessBuilder(cmd);
-        Process proc = procBuilder.start();
-        while(proc.isAlive());
-        proc.exitValue();
+        procBuilder.start();
     }
 
     public static OS getOperatingSystem() {