update electron/electron-prebuilt, remove gunzip option

This commit is contained in:
Stephen Birarda 2016-04-12 11:40:11 -07:00
parent 149bf0be92
commit 8850ebd158
4 changed files with 8 additions and 13 deletions

View file

@ -9,8 +9,8 @@
], ],
"devDependencies": { "devDependencies": {
"electron-compilers": "^1.0.1", "electron-compilers": "^1.0.1",
"electron-packager": "^5.2.1", "electron-packager": "^6.0.2",
"electron-prebuilt": "0.35.4" "electron-prebuilt": "0.37.5"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -30,7 +30,7 @@
"fs-extra": "^0.26.4", "fs-extra": "^0.26.4",
"node-notifier": "^4.4.0", "node-notifier": "^4.4.0",
"os-homedir": "^1.0.1", "os-homedir": "^1.0.1",
"request": "2.67.0", "request": "^2.67.0",
"request-progress": "1.0.2", "request-progress": "1.0.2",
"tar-fs": "^1.12.0", "tar-fs": "^1.12.0",
"yargs": "^3.30.0" "yargs": "^3.30.0"

View file

@ -17,7 +17,7 @@ var iconName = argv.production ? "console" : "console-beta";
var options = { var options = {
dir: __dirname, dir: __dirname,
name: "server-console", name: "server-console",
version: "0.35.4", version: "0.37.5",
overwrite: true, overwrite: true,
prune: true, prune: true,
arch: "x64", arch: "x64",

View file

@ -16,7 +16,7 @@
</div> </div>
<div id="state-installing" class="state"> <div id="state-installing" class="state">
<h1>Installing<span class="one">.</span><span class="two">.</span><span class="three">.</span></h1> <h1>Extracting<span class="one">.</span><span class="two">.</span><span class="three">.</span></h1>
<em>Just a moment</em> <em>Just a moment</em>
</div> </div>

View file

@ -561,14 +561,14 @@ function maybeInstallDefaultContentSet(onComplete) {
sendStateUpdate('error', { sendStateUpdate('error', {
message: message message: message
}); });
} else {
sendStateUpdate('installing');
} }
}), { throttle: 250 }).on('progress', function(state) { }), { throttle: 250 }).on('progress', function(state) {
if (!aborted) { if (!aborted) {
// Update progress popup // Update progress popup
sendStateUpdate('downloading', state); sendStateUpdate('downloading', state);
} }
}).on('end', function(){
sendStateUpdate('installing');
}); });
function extractError(err) { function extractError(err) {
@ -582,13 +582,8 @@ function maybeInstallDefaultContentSet(onComplete) {
}); });
} }
var gunzip = zlib.createGunzip({ var gunzip = zlib.createGunzip();
level: 9
});
gunzip.on('error', extractError); 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(){ req.pipe(gunzip).pipe(tar.extract(getRootHifiDataDirectory())).on('error', extractError).on('finish', function(){
// response and decompression complete, return // response and decompression complete, return