Merge branch 'innolab' into develop

This commit is contained in:
Maikiwi 2022-02-18 14:02:42 -08:00 committed by GitHub
commit 873d234999
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 266 additions and 81 deletions

View file

@ -664,7 +664,7 @@ export class BrowserWindow {
console.log(err)
});
});
/*
ipcMain.on('check-for-update', async (_event) => {
const branch = utils.getStoreValue('general.update_branch')
let latestbranch = await fetch(`https://circleci.com/api/v1.1/project/gh/ciderapp/Cider/latest/artifacts?branch=${branch}&filter=successful`)
@ -680,10 +680,10 @@ export class BrowserWindow {
const options: any = {
provider: 'generic',
url: `${base_url}`
}
}*/
/*
* 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()
@ -697,7 +697,7 @@ export class BrowserWindow {
event.returnValue = true
}
})
*/
ipcMain.on('share-menu', async (_event, url) => {
if (process.platform != 'darwin') return;