diff --git a/scripts/devRunner.js b/scripts/devRunner.js index aaf4c90c..ed3eff40 100644 --- a/scripts/devRunner.js +++ b/scripts/devRunner.js @@ -113,7 +113,6 @@ function startRenderer (callback) { }); const server = new WebpackDevServer(compiler, { - static: path.join(__dirname, '../'), hot: true, port: 9080, client: { diff --git a/src/main/ipc-handlers/updates.js b/src/main/ipc-handlers/updates.js index ff72702e..19636b52 100644 --- a/src/main/ipc-handlers/updates.js +++ b/src/main/ipc-handlers/updates.js @@ -2,6 +2,7 @@ import { ipcMain } from 'electron'; import { autoUpdater } from 'electron-updater'; import Store from 'electron-store'; const persistentStore = new Store({ name: 'settings' }); +const isMacOS = process.platform === 'darwin'; let mainWindow; autoUpdater.allowPrerelease = persistentStore.get('allow_prerelease', true); @@ -11,6 +12,9 @@ export default () => { mainWindow = event; if (process.windowsStore || (process.platform === 'linux' && !process.env.APPIMAGE)) mainWindow.reply('no-auto-update'); + else if (isMacOS) { // Temporary solution on MacOS for unsigned app updates + autoUpdater.autoDownload = false; + } else { autoUpdater.checkForUpdatesAndNotify().catch(() => { mainWindow.reply('check-failed'); @@ -28,7 +32,10 @@ export default () => { }); autoUpdater.on('update-available', () => { - mainWindow.reply('update-available'); + if (isMacOS) + mainWindow.reply('link-to-download'); + else + mainWindow.reply('update-available'); }); autoUpdater.on('update-not-available', () => { diff --git a/src/renderer/components/ModalSettings.vue b/src/renderer/components/ModalSettings.vue index 7ea9feac..8c1f5f39 100644 --- a/src/renderer/components/ModalSettings.vue +++ b/src/renderer/components/ModalSettings.vue @@ -396,7 +396,7 @@ export default { return locales; }, hasUpdates () { - return ['available', 'downloading', 'downloaded'].includes(this.updateStatus); + return ['available', 'downloading', 'downloaded', 'link'].includes(this.updateStatus); }, workspace () { return this.getWorkspace(this.selectedWorkspace); diff --git a/src/renderer/components/ModalSettingsUpdate.vue b/src/renderer/components/ModalSettingsUpdate.vue index 0ca3d17f..f69e9839 100644 --- a/src/renderer/components/ModalSettingsUpdate.vue +++ b/src/renderer/components/ModalSettingsUpdate.vue @@ -29,12 +29,19 @@ {{ $t('message.checkForUpdates') }} +