Merge branch 'master' of https://github.com/MaiaVictor/swarm-js

VictorTaelin · Jul 13, 2017 · 9c9c5a6 · 9c9c5a6
2 parents bed1ccd + e53f2d5
commit 9c9c5a6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/archives/archives.json b/archives/archives.json
@@ -64,4 +64,4 @@
     "binaryMD5": "ec1abcf7b216e87645ec83954d8344cd",
     "archiveMD5": "a81fd0158190d99813c738ffa4f87627"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "swarm-js",
-  "version": "0.1.20",
+  "version": "0.1.22",
   "description": "Swarm tools for JavaScript.",
   "main": "lib/swarm.js",
   "scripts": {

diff --git a/scripts/prepareArchives.js b/scripts/prepareArchives.js
@@ -69,10 +69,12 @@ got("https://gethstore.blob.core.windows.net/builds?restype=container&comp=list"
     return Q.all(binaries
       .filter(bin => bin.version === binaries[binaries.length - 1].version)
       .map(bin => {
-        const archive = archives[bin.os+"-"+bin.arch] = {
+        const archive = archives[bin.os + "-" + bin.arch] = {
           archive: bin.swarmArchiveName
         };
+        console.log("Downloading " + bin.gethArchivePath + ".");
         return files.download(bin.gethArchiveUrl)(bin.gethArchivePath)
+          .then(path => (console.log("Downloaded " + path + "."), path))
           .then(path => decompress(path, "tmp_downloads"))
           .then(() => !fs.existsSync(bin.swarmBinaryDir) && fsp.mkdir(bin.swarmBinaryDir))
           .then(() => files.search(/swarm(.exe|)$/)(bin.gethFilesPath))
@@ -81,7 +83,8 @@ got("https://gethstore.blob.core.windows.net/builds?restype=container&comp=list"
           .then(binaryMD5 => archive.binaryMD5 = binaryMD5)
           .then(() => targz().compress(bin.swarmBinaryDir, bin.swarmArchivePath))
           .then(() => files.hash("md5")(bin.swarmArchivePath))
-          .then(archiveMD5 => archive.archiveMD5 = archiveMD5);
+          .then(archiveMD5 => archive.archiveMD5 = archiveMD5)
+          .catch(e => console.log(e));
       }))
       .then(() => fs.writeFileSync("archives/archives.json", JSON.stringify(archives, null, 2)));
   })