From 3e21bb354b48ea6efa3d533d0691a1034dee5639 Mon Sep 17 00:00:00 2001 From: Kevin Harrington Date: Sat, 13 Jul 2024 17:44:35 -0400 Subject: [PATCH] Auto-updater is now woring --- .../com/commonwealthrobotics/CadoodleUpdater.java | 13 +++++++++---- .../java/com/commonwealthrobotics/JvmManager.java | 2 +- .../main/java/com/commonwealthrobotics/Main.java | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/CadoodleUpdater.java b/CaDoodleUpdater/src/main/java/com/commonwealthrobotics/CadoodleUpdater.java index ed0ca1e..5501730 100644 --- 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> assets = (List>) database.get("assets"); downloadJarURL=null; for (Map 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 index d8abb11..7c03098 100644 --- 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 index a4ba613..f5f7e11 100644 --- 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); }