From e3290c1117a47dbf7c6cf160c7c75420b9c46147 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 1 Dec 2016 11:35:26 +0000 Subject: [PATCH] Switch to new auto-update & add linux build * Remove squirrel hooks (the installing & uninstalling is now done by the, er, installer) * Switch to electron-auto-update * Shorten initial update delay because we no longer need to wait for squirrel to release a lock file * Change update URLs because windows is now one installer for both 32 & 64 bit. * Update electron-builder to 10 where NSIS is now the default target for Windows. * Add linux to the target list, building a deb. * Remove sqirrel-specific installation spinner * Remove redundant !**/* from files --- electron/build/install-spinner.gif | Bin 23967 -> 0 bytes electron/src/electron-main.js | 41 ++++++++++------------------- electron/src/squirrelhooks.js | 30 --------------------- package.json | 12 +++++---- 4 files changed, 21 insertions(+), 62 deletions(-) delete mode 100644 electron/build/install-spinner.gif delete mode 100644 electron/src/squirrelhooks.js diff --git a/electron/build/install-spinner.gif b/electron/build/install-spinner.gif deleted file mode 100644 index 4a89337be40cf202fe232bca49c1c0c84b278463..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 23967 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 T>|@V>heO2~5&w^bLiPUwJMS@r diff --git a/electron/src/electron-main.js b/electron/src/electron-main.js index fe0839304..044eca562 100644 --- a/electron/src/electron-main.js +++ b/electron/src/electron-main.js @@ -17,13 +17,11 @@ See the License for the specific language governing permissions and limitations under the License. */ -// Squirrel on windows starts the app with various flags -// as hooks to tell us when we've been installed/uninstalled -// etc. -const check_squirrel_hooks = require('./squirrelhooks'); -if (check_squirrel_hooks()) return; - const electron = require('electron'); + +// Auto updater from the 'electron-auto-updater' package for NSIS +// auto-update support (not the one that comes with electron). +const autoUpdater = require('electron-auto-updater').autoUpdater; const url = require('url'); const VectorMenu = require('./vectormenu'); @@ -45,7 +43,7 @@ const PERMITTED_URL_SCHEMES = [ ]; const UPDATE_POLL_INTERVAL_MS = 60 * 60 * 1000; -const INITIAL_UPDATE_DELAY_MS = 30 * 1000; +const INITIAL_UPDATE_DELAY_MS = 5 * 1000; let mainWindow = null; let appQuitting = false; @@ -90,12 +88,12 @@ function installUpdate() { // for some reason, quitAndInstall does not fire the // before-quit event, so we need to set the flag here. appQuitting = true; - electron.autoUpdater.quitAndInstall(); + autoUpdater.quitAndInstall(); } function pollForUpdates() { try { - electron.autoUpdater.checkForUpdates(); + autoUpdater.checkForUpdates(); } catch (e) { console.log("Couldn't check for update", e); } @@ -106,30 +104,19 @@ function startAutoUpdate(update_url) { update_url = update_url + '/'; } try { - // For reasons best known to Squirrel, the way it checks for updates - // is completely different between macOS and windows. On macOS, it - // hits a URL that either gives it a 200 with some json or - // 204 No Content. On windows it takes a base path and looks for - // files under that path. + // Since writing, the electron auto update process has changed from being + // completely different between platforms to being differently completely + // different. On Mac, we set the feed URL here. On Windows, it uses a + // yaml file bundled at build time from the 'publish' entry in the + // package.json. There is no autoupdate for Linux: it's expected that + // the distro will provide it. if (process.platform == 'darwin') { - // macos only has 64 bit - electron.autoUpdater.setFeedURL(update_url + 'macos/'); - } else if (process.platform == '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 - // implemented it on Linux, or if it would be different again. - console.log("Auto update not supported on this platform"); + autoUpdater.setFeedURL(update_url + 'macos/'); } // We check for updates ourselves rather than using 'updater' because we need to // do it in the main process (and we don't really need to check every 10 minutes: // every hour should be just fine for a desktop app) // However, we still let the main window listen for the update events. - // We also wait a short time before checking for updates the first time because - // of squirrel on windows and it taking a small amount of time to release a - // lock file. setTimeout(pollForUpdates, INITIAL_UPDATE_DELAY_MS); setInterval(pollForUpdates, UPDATE_POLL_INTERVAL_MS); } catch (err) { diff --git a/electron/src/squirrelhooks.js b/electron/src/squirrelhooks.js deleted file mode 100644 index 10fb8d9ec..000000000 --- a/electron/src/squirrelhooks.js +++ /dev/null @@ -1,30 +0,0 @@ -const path = require('path'); -const spawn = require('child_process').spawn; -const app = require('electron').app; - -function run_update_exe(args, done) { - const updateExe = path.resolve(path.dirname(process.execPath), '..', 'Update.exe'); - spawn(updateExe, args, { - detached: true - }).on('close', done); -}; - -function check_squirrel_hooks() { - if (process.platform != 'win32') return false; - - const cmd = process.argv[1]; - const target = path.basename(process.execPath); - if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') { - run_update_exe(['--createShortcut=' + target + ''], app.quit); - return true; - } else if (cmd === '--squirrel-uninstall') { - run_update_exe(['--removeShortcut=' + target + ''], app.quit); - return true; - } else if (cmd === '--squirrel-obsolete') { - app.quit(); - return true; - } - return false; -} - -module.exports = check_squirrel_hooks; diff --git a/package.json b/package.json index 54de856bb..0f16ce715 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "build:compile": "babel --source-maps -d lib src", "build:bundle": "NODE_ENV=production webpack -p --progress", "build:bundle:dev": "webpack --optimize-occurence-order --progress", - "build:electron": "rimraf electron/dist && npm run clean && npm run build && build -wm --ia32 --x64 && scripts/check-electron.sh", + "build:electron": "rimraf electron/dist && npm run clean && npm run build && build -wml --ia32 --x64 && scripts/check-electron.sh", "build": "node scripts/babelcheck.js && npm run build:res && npm run build:config && npm run build:emojione && npm run build:css && npm run build:bundle", "build:dev": "node scripts/babelcheck.js && npm run build:res && npm run build:config && npm run build:emojione && npm run build:css && npm run build:bundle:dev", "dist": "scripts/package.sh", @@ -58,6 +58,7 @@ "browser-request": "^0.3.3", "classnames": "^2.1.2", "draft-js": "^0.8.1", + "electron-auto-updater": "^0.6.2", "extract-text-webpack-plugin": "^0.9.1", "favico.js": "^0.3.10", "filesize": "^3.1.2", @@ -97,7 +98,7 @@ "catw": "^1.0.1", "cpx": "^1.3.2", "css-raw-loader": "^0.1.1", - "electron-builder": "^7.23.2", + "electron-builder": "^10.4.1", "emojione": "^2.2.3", "expect": "^1.16.0", "fs-extra": "^0.30.0", @@ -134,14 +135,15 @@ "dereference": true, "//files": "We bundle everything, so we only need to include webapp/", "files": [ - "!**/*", "electron/src/**", "electron/img/**", + "node_modules/electron-auto-updater/**", "webapp/**", "package.json" ], - "squirrelWindows": { - "iconUrl": "https://riot.im/favicon.ico" + "linux": { + "target": "deb", + "maintainer": "support@riot.im" } }, "directories": {