diff --git a/server-console/package.json b/server-console/package.json index ece562c1c4..d97f72609b 100644 --- a/server-console/package.json +++ b/server-console/package.json @@ -9,8 +9,8 @@ ], "devDependencies": { "electron-compilers": "^1.0.1", - "electron-packager": "^5.2.1", - "electron-prebuilt": "0.35.4" + "electron-packager": "^6.0.2", + "electron-prebuilt": "0.37.5" }, "repository": { "type": "git", @@ -30,7 +30,7 @@ "fs-extra": "^0.26.4", "node-notifier": "^4.4.0", "os-homedir": "^1.0.1", - "request": "2.67.0", + "request": "^2.67.0", "request-progress": "1.0.2", "tar-fs": "^1.12.0", "yargs": "^3.30.0" diff --git a/server-console/packager.js b/server-console/packager.js index 657098d2f4..bc3b8989d2 100644 --- a/server-console/packager.js +++ b/server-console/packager.js @@ -17,7 +17,7 @@ var iconName = argv.production ? "console" : "console-beta"; var options = { dir: __dirname, name: "server-console", - version: "0.35.4", + version: "0.37.5", overwrite: true, prune: true, arch: "x64", diff --git a/server-console/src/downloader.html b/server-console/src/downloader.html index a7ba7bd7b7..07d3392246 100644 --- a/server-console/src/downloader.html +++ b/server-console/src/downloader.html @@ -16,7 +16,7 @@
-

Installing...

+

Extracting...

Just a moment
diff --git a/server-console/src/main.js b/server-console/src/main.js index c7917eaf59..ee91ca01f3 100644 --- a/server-console/src/main.js +++ b/server-console/src/main.js @@ -561,14 +561,14 @@ function maybeInstallDefaultContentSet(onComplete) { sendStateUpdate('error', { message: message }); - } else { - sendStateUpdate('installing'); } }), { throttle: 250 }).on('progress', function(state) { if (!aborted) { // Update progress popup sendStateUpdate('downloading', state); } + }).on('end', function(){ + sendStateUpdate('installing'); }); function extractError(err) { @@ -582,13 +582,8 @@ function maybeInstallDefaultContentSet(onComplete) { }); } - var gunzip = zlib.createGunzip({ - level: 9 - }); + var gunzip = zlib.createGunzip(); gunzip.on('error', extractError); - gunzip.on('finish', function(){ - console.log("GUNZIP DONE"); - }); req.pipe(gunzip).pipe(tar.extract(getRootHifiDataDirectory())).on('error', extractError).on('finish', function(){ // response and decompression complete, return