From 8c8ca9a1065b569a174f8520c3b51a09f068c5df Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 17 Aug 2021 04:49:27 -0700 Subject: [PATCH] 1 --- packages/gui/package.json | 2 +- packages/gui/src/bridge/auto-start/backend.js | 65 +++++++++++++++---- packages/gui/src/bridge/update/front.js | 4 +- packages/gui/vue.config.js | 4 +- 4 files changed, 56 insertions(+), 19 deletions(-) diff --git a/packages/gui/package.json b/packages/gui/package.json index 3ace4bd..0f22611 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -55,7 +55,7 @@ "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-service": "~4.5.0", "babel-eslint": "^10.1.0", - "electron": "^13.0.0", + "electron": "13.1.9", "electron-devtools-installer": "^3.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", diff --git a/packages/gui/src/bridge/auto-start/backend.js b/packages/gui/src/bridge/auto-start/backend.js index e04cbb1..6d4e362 100644 --- a/packages/gui/src/bridge/auto-start/backend.js +++ b/packages/gui/src/bridge/auto-start/backend.js @@ -1,3 +1,29 @@ +import DevSidecar from '@docmirror/dev-sidecar' + +async function setAutoStartForLinux (app, enable = true) { + const path = app.getPath('exe') + if (enable) { + const cmd = ` +mkdir -p ~/.config/autostart/ +cat >> ~/.config/autostart/dev-sidecar.desktop < { - log.info('auto-start', app.getPath('exe')) + ipcMain.on('auto-start', async (event, message) => { + console.log('auto start', message) + const isLinux = DevSidecar.api.shell.getSystemPlatform() === 'linux' if (message.value) { - app.setLoginItemSettings({ - openAtLogin: true, - path: ex, - args: [ - '--hideWindow', '"true"' - ] - }) + if (isLinux) { + await setAutoStartForLinux(app, true) + } else { + app.setLoginItemSettings({ + openAtLogin: true, + path: ex, + args: [ + '--process-start-args', '"--hidden"' + ] + }) + } + event.sender.send('auto-start', { key: 'enabled', value: true }) } else { - app.setLoginItemSettings({ - openAtLogin: false, - path: ex, - args: [] - }) + if (isLinux) { + await setAutoStartForLinux(app, false) + } else { + app.setLoginItemSettings({ + openAtLogin: false, + path: ex, + args: [] + }) + } + event.sender.send('auto-start', { key: 'enabled', value: false }) } }) diff --git a/packages/gui/src/bridge/update/front.js b/packages/gui/src/bridge/update/front.js index 8f7f319..051759b 100644 --- a/packages/gui/src/bridge/update/front.js +++ b/packages/gui/src/bridge/update/front.js @@ -61,10 +61,10 @@ function install (app, api) { api.update.downloadPart(value) } else { api.shell.getSystemPlatform().then((platform) => { - if (platform === 'mac') { + if (platform === 'mac' || platform === 'linux') { app.$notification.open({ duration: 15, - message: 'Mac暂不支持全量自动升级', + message: '暂不支持自动升级', description: '请前往github或gitee项目release页面下载新版本手动安装', onClick: () => { diff --git a/packages/gui/vue.config.js b/packages/gui/vue.config.js index 17b35da..d07525f 100644 --- a/packages/gui/vue.config.js +++ b/packages/gui/vue.config.js @@ -66,8 +66,8 @@ module.exports = { linux: { icon: 'build/mac/', target: [ - // 'deb' - 'AppImage' + 'deb' + // 'AppImage' ] }, publish: {