From e6aef8ebf81be59f3e2dc55c67fe231c34bd100f Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 14 Nov 2020 15:17:23 -0500 Subject: [PATCH] use raw version in URLs --- .../bubble/service/boot/PublicUpgradeMonitorService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java b/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java index 07e082a5..75a09ffa 100644 --- a/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java +++ b/bubble-server/src/main/java/bubble/service/boot/PublicUpgradeMonitorService.java @@ -45,7 +45,8 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor { @Override protected void process() { try { - final String fullVersion = url2string(RELEASE_VERSION_URL).replace("_", " "); + final String rawVersion = url2string(RELEASE_VERSION_URL); + final String fullVersion = rawVersion.replace("_", " "); String currentVersion = configuration.getVersionInfo().getVersion(); // only update our sage version if the new public version is both // -- newer than ourselves @@ -57,7 +58,7 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor { configuration.setSageVersion(new BubbleVersionInfo() .setVersion(fullVersion) .setShortVersion(shortVersion) - .setSha256(url2string(RELEASE_SHA_URL.replace(VERSION_TOKEN, fullVersion)))); + .setSha256(url2string(RELEASE_SHA_URL.replace(VERSION_TOKEN, rawVersion)))); } } catch (Exception e) { log.warn("process: error: "+shortError(e)); @@ -68,7 +69,9 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor { try { @Cleanup final TempDir temp = new TempDir(); final File bubbleZip = new File(temp, "bubble.zip"); - url2file(RELEASE_JAR_URL.replace(VERSION_TOKEN, sageVersion.getVersion()), bubbleZip); + final String jarUrl = RELEASE_JAR_URL.replace(VERSION_TOKEN, sageVersion.getVersion().replace(" ", "_")); + log.info("downloadJar: downloading from "+jarUrl+" -> "+abs(bubbleZip)); + url2file(jarUrl, bubbleZip); Decompressors.extract(bubbleZip, temp); final File jarFile = new File(abs(temp) + "/bubble-" + sageVersion.getVersion() + "/bubble.jar"); if (!jarFile.exists()) {