Auto-updater is now woring

CommonWealthRobotics · Jul 13, 2024 · 3e21bb3 · 3e21bb3
1 parent 59270c1
commit 3e21bb3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/CadoodleUpdater.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/CadoodleUpdater.java
@@ -260,16 +260,21 @@ public static void readCurrentVersion(String url) throws IOException {
 			List<Map<String, Object>> assets = (List<Map<String, Object>>) database.get("assets");
 			downloadJarURL=null;
 			for (Map<String, Object> key : assets) {
-				if (((String) key.get("name")).contentEquals(jarName)) {
+				String string = (String) key.get("name");
+
+				System.out.println("Checking "+string);
+				if (string.contentEquals(jarName)) {
 					downloadJarURL = (String) key.get("browser_download_url");
 					sizeOfJar = ((Double) key.get("size")).longValue();
 					System.out.println(downloadJarURL + " Size " + sizeOfJar + " bytes");
-				}
-				if (((String) key.get("name")).contentEquals("jvm.json")) {
+				}else
+					System.out.println(string+" is not "+jarName);
+				if (string.contentEquals("jvm.json")) {
 					downloadJsonURL = (String) key.get("browser_download_url");
 					sizeOfJson = ((Double) key.get("size")).longValue();
 					System.out.println(downloadJsonURL + " Size " + sizeOfJson + " bytes");
-				}
+				}else
+					System.out.println(string+" is not jvm.json");
 
 			}
 			if(downloadJarURL==null) {

diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/JvmManager.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/JvmManager.java
@@ -50,7 +50,7 @@ public class JvmManager {
 	public static String getCommandString(String project, String repo, String version, String downloadJsonURL,
 			long sizeOfJson, ProgressBar progress, String bindir) throws Exception {
 		if(version==null)
-			version="0.0.4";
+			version="0.0.6";
 		File exe;
 
 		exe= download(version, downloadJsonURL, sizeOfJson, progress, bindir, "jvm.json");

diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/Main.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/Main.java
@@ -26,7 +26,7 @@ public static void main(String [] args) {
 		CadoodleUpdater.argsFromSystem=args;
 		CadoodleUpdater.project="CommonWealthRobotics";
 		CadoodleUpdater.repoName=		"CaDoodle-Application";
-		CadoodleUpdater.jarName=		"CaDoodle-Application.jar ";
+		CadoodleUpdater.jarName=		"CaDoodle-Application.jar";
 
 		launch(args);
 	}