Browse Source

trim versions and hashes

tags/v1.1.4
Jonathan Cobb 4 years ago
parent
commit
36f7c7fcde
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      bubble-server/src/main/java/bubble/service/packer/PackerJob.java
  2. +1
    -1
      bubble-server/src/main/java/bubble/service/packer/PackerService.java

+ 1
- 1
bubble-server/src/main/java/bubble/service/packer/PackerJob.java View File

@@ -313,7 +313,7 @@ public class PackerJob implements Callable<List<PackerImage>> {
final String version = packerService.getSoftwareVersion(roleName); final String version = packerService.getSoftwareVersion(roleName);
vars.put(roleName, version); vars.put(roleName, version);


final String hash = url2string(releaseUrlBase+"/"+version+"/"+roleName+".zip.sha256");
final String hash = url2string(releaseUrlBase+"/"+version+"/"+roleName+".zip.sha256").trim();
String varsData = roleName+"_sha256 : '"+hash+"'\n" String varsData = roleName+"_sha256 : '"+hash+"'\n"
+ roleName+"_version : '" + version + "'\n"; + roleName+"_version : '" + version + "'\n";




+ 1
- 1
bubble-server/src/main/java/bubble/service/packer/PackerService.java View File

@@ -122,7 +122,7 @@ public class PackerService {
final String releaseUrlBase = configuration.getReleaseUrlBase(); final String releaseUrlBase = configuration.getReleaseUrlBase();
return softwareVersions.computeIfAbsent(roleName, r -> { return softwareVersions.computeIfAbsent(roleName, r -> {
try { try {
return url2string(releaseUrlBase+"/"+r+"/latest.txt");
return url2string(releaseUrlBase+"/"+r+"/latest.txt").trim();
} catch (IOException e) { } catch (IOException e) {
return die("getSoftwareVersion("+r+"): "+shortError(e), e); return die("getSoftwareVersion("+r+"): "+shortError(e), e);
} }


Loading…
Cancel
Save