From a1347e7bf1da37b00972e6c25e62b42803399d69 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 25 Nov 2016 20:09:21 +0000 Subject: [PATCH] Correct vector to webapp & platform update URLs --- electron/src/electron-main.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/electron/src/electron-main.js b/electron/src/electron-main.js index 18758eee9..fe0839304 100644 --- a/electron/src/electron-main.js +++ b/electron/src/electron-main.js @@ -30,7 +30,7 @@ const VectorMenu = require('./vectormenu'); let vectorConfig = {}; try { - vectorConfig = require('../../vector/config.json'); + vectorConfig = require('../../webapp/config.json'); } catch (e) { // it would be nice to check the error code here and bail if the config // is unparseable, but we get MODULE_NOT_FOUND in the case of a missing @@ -112,9 +112,11 @@ function startAutoUpdate(update_url) { // 204 No Content. On windows it takes a base path and looks for // files under that path. if (process.platform == 'darwin') { - electron.autoUpdater.setFeedURL(update_url); + // macos only has 64 bit + electron.autoUpdater.setFeedURL(update_url + 'macos/'); } else if (process.platform == 'win32') { - electron.autoUpdater.setFeedURL(update_url + 'win32/'); + // We split by 32/64 bit too: the builds are different and entirely separate + electron.autoUpdater.setFeedURL(update_url + 'win32/' + process.arch + '/'); } else { // Squirrel / electron only supports auto-update on these two platforms. // I'm not even going to try to guess which feed style they'd use if they