Fixing beta updates [WIP] #269

zulip · Aug 18, 2017 · 39d30b9 · 39d30b9
1 parent 733209e
commit 39d30b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/app/main/autoupdater.js b/app/main/autoupdater.js
@@ -1,14 +1,22 @@
 'use strict';
 const {app, dialog} = require('electron');
 const {autoUpdater} = require('electron-updater');
+const isDev = require('electron-is-dev');
 
 const ConfigUtil = require('./../renderer/js/utils/config-util.js');
 
 function appUpdater() {
+	// Don't initiate auto-updates in development and on Linux system
+	// since autoUpdater doesn't work on Linux
+	if (isDev || process.platform === 'linux') {
+		return;
+	}
+
 	// Log whats happening
 	const log = require('electron-log');
 	log.transports.file.level = 'info';
 	autoUpdater.logger = log;
+
 	// Handle auto updates for beta/pre releases
 	autoUpdater.allowPrerelease = ConfigUtil.getConfigItem('betaUpdate') || false;
 

diff --git a/app/main/index.js b/app/main/index.js
@@ -2,7 +2,6 @@
 const path = require('path');
 const electron = require('electron');
 const electronLocalshortcut = require('electron-localshortcut');
-const isDev = require('electron-is-dev');
 const windowStateKeeper = require('electron-window-state');
 const appMenu = require('./menu');
 const { appUpdater } = require('./autoupdater');
@@ -34,10 +33,6 @@ if (isAlreadyRunning) {
 	return app.quit();
 }
 
-function isWindowsOrmacOS() {
-	return process.platform === 'darwin' || process.platform === 'win32';
-}
-
 const APP_ICON = path.join(__dirname, '../resources', 'Icon');
 
 const iconPath = () => {
@@ -167,11 +162,8 @@ app.on('ready', () => {
 	});
 
 	page.once('did-frame-finish-load', () => {
-		const checkOS = isWindowsOrmacOS();
-		if (checkOS && !isDev) {
-			// Initate auto-updates on MacOS and Windows
-			appUpdater();
-		}
+		// Initate auto-updates on MacOS and Windows
+		appUpdater();
 	});
 
 	electron.powerMonitor.on('resume', () => {