From 23dafc403630c4bdd6b64b88632a5297df19b3b6 Mon Sep 17 00:00:00 2001 From: child_duckling <19170969+child-duckling@users.noreply.github.com> Date: Fri, 25 Feb 2022 22:54:50 -0800 Subject: [PATCH] check for update on launch, prep for operation balls --- src/main/base/browserwindow.ts | 17 ++++++++++------- src/preload/cider-preload.js | 2 ++ src/renderer/index.js | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 5c336cf6..7edde0d6 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -986,15 +986,13 @@ export class BrowserWindow { const options: any = { provider: 'generic', - url: `${base_url}` + url: `${base_url}`, + allowDowngrade: true, } // Have to handle the auto updaters seperatly until we can support macOS. electron-builder limitation -q - - const win_autoUpdater = new NsisUpdater(options) //Windows - const linux_autoUpdater = new AppImageUpdater(options) //Linux - await win_autoUpdater.checkForUpdatesAndNotify() - await linux_autoUpdater.checkForUpdatesAndNotify() + if (process.platform === 'win32') await new NsisUpdater(options).checkForUpdatesAndNotify() //Windows + if (process.platform === 'linux') await new AppImageUpdater(options).checkForUpdatesAndNotify() //Linux }); ipcMain.on('disable-update', (event) => { // Check if using app store builds so people don't get pissy wen button go bonk @@ -1019,7 +1017,12 @@ export class BrowserWindow { }) ipcMain.on('get-version', (_event) => { - _event.returnValue = app.getVersion() + if (app.isPackaged){ + _event.returnValue = app.getVersion() + } else { + _event.returnValue = `Experimental running on Electron ${app.getVersion()}` + } + }); ipcMain.on('open-appdata', (_event) => { shell.openPath(app.getPath('userData')); diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js index 84a55e91..1558327f 100644 --- a/src/preload/cider-preload.js +++ b/src/preload/cider-preload.js @@ -156,3 +156,5 @@ process.once('loaded', () => { console.log("Setting ipcRenderer") global.MusicKitInterop = MusicKitInterop; }); + +ipcRenderer.send('check-for-update') diff --git a/src/renderer/index.js b/src/renderer/index.js index 2f3a4ff5..b276c05e 100644 --- a/src/renderer/index.js +++ b/src/renderer/index.js @@ -64,7 +64,7 @@ const store = new Vuex.Store({ } } }) - +ipcRenderer.send('check-for-update') const app = new Vue({ el: "#app", store: store,