From aba560b0fbe445b7123dee1348568e14a763e11e Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 14 Nov 2020 17:21:51 -0500 Subject: [PATCH] trim raw version, put sha url in variable --- .../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 75a09ffa..58ed7c1d 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,7 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor { @Override protected void process() { try { - final String rawVersion = url2string(RELEASE_VERSION_URL); + final String rawVersion = url2string(RELEASE_VERSION_URL).trim(); final String fullVersion = rawVersion.replace("_", " "); String currentVersion = configuration.getVersionInfo().getVersion(); // only update our sage version if the new public version is both @@ -53,12 +53,15 @@ public class PublicUpgradeMonitorService extends JarUpgradeMonitor { // -- newer than the current sageVersion (or the current sageVersion is null) if (isNewerVersion(fullVersion, currentVersion) && (configuration.getSageVersion() == null || isNewerVersion(fullVersion, configuration.getSageVersion().getVersion()))) { - log.info("process: found newer version: "+fullVersion+" (current version "+currentVersion+"), setting configuration.sageVersion"); + log.info("process: latest version ("+fullVersion+") is newer than current version ("+currentVersion+"), setting configuration.sageVersion"); final String shortVersion = fullVersion.substring(fullVersion.indexOf(" ") + 1); + final String shaUrl = RELEASE_SHA_URL.replace(VERSION_TOKEN, rawVersion); configuration.setSageVersion(new BubbleVersionInfo() .setVersion(fullVersion) .setShortVersion(shortVersion) - .setSha256(url2string(RELEASE_SHA_URL.replace(VERSION_TOKEN, rawVersion)))); + .setSha256(url2string(shaUrl))); + } else { + log.info("process: latest version ("+fullVersion+") is older than current version ("+currentVersion+"), not setting configuration.sageVersion"); } } catch (Exception e) { log.warn("process: error: "+shortError(e));