mirror of
https://github.com/wavetermdev/backup.git
synced 2026-08-05 13:57:07 -07:00
use native install on quit instead
This commit is contained in:
+1
-1
@@ -731,7 +731,6 @@ electronApp.on("window-all-closed", () => {
|
||||
});
|
||||
electronApp.on("before-quit", () => {
|
||||
globalIsQuitting = true;
|
||||
updater?.installUpdate();
|
||||
});
|
||||
process.on("SIGINT", () => {
|
||||
console.log("Caught SIGINT, shutting down");
|
||||
@@ -809,6 +808,7 @@ async function appMain() {
|
||||
await electronApp.whenReady();
|
||||
await relaunchBrowserWindows();
|
||||
await configureAutoUpdater();
|
||||
|
||||
globalIsStarting = false;
|
||||
|
||||
electronApp.on("activate", async () => {
|
||||
|
||||
+4
-3
@@ -187,23 +187,24 @@ export async function configureAutoUpdater() {
|
||||
|
||||
autoUpdateLock = true;
|
||||
|
||||
const autoUpdateEnabled = (await services.FileService.GetSettingsConfig()).autoupdate.enabled;
|
||||
const autoUpdateOpts = (await services.FileService.GetSettingsConfig()).autoupdate;
|
||||
|
||||
try {
|
||||
console.log("Configuring updater");
|
||||
updater = new Updater();
|
||||
autoUpdater.autoInstallOnAppQuit = autoUpdateOpts.installonquit;
|
||||
} catch (e) {
|
||||
console.warn("error configuring updater", e.toString());
|
||||
}
|
||||
|
||||
if (autoUpdateEnabled && updater?.interval == null) {
|
||||
if (autoUpdateOpts.enabled && updater?.interval == null) {
|
||||
try {
|
||||
console.log("configuring auto update interval");
|
||||
updater?.startInterval();
|
||||
} catch (e) {
|
||||
console.log("error configuring auto update interval", e.toString());
|
||||
}
|
||||
} else if (!autoUpdateEnabled && updater?.interval != null) {
|
||||
} else if (!autoUpdateOpts.enabled && updater?.interval != null) {
|
||||
console.log("disabling auto updater");
|
||||
clearInterval(updater.interval);
|
||||
updater = null;
|
||||
|
||||
Vendored
+1
@@ -19,6 +19,7 @@ declare global {
|
||||
type AutoUpdateOpts = {
|
||||
enabled: boolean;
|
||||
intervalms: number;
|
||||
installonquit: boolean;
|
||||
};
|
||||
|
||||
// wstore.Block
|
||||
|
||||
@@ -48,8 +48,9 @@ type BlockHeaderOpts struct {
|
||||
}
|
||||
|
||||
type AutoUpdateOpts struct {
|
||||
Enabled bool `json:"enabled"`
|
||||
IntervalMs uint32 `json:"intervalms"`
|
||||
Enabled bool `json:"enabled"`
|
||||
IntervalMs uint32 `json:"intervalms"`
|
||||
InstallOnQuit bool `json:"installonquit"`
|
||||
}
|
||||
|
||||
type TermThemeType struct {
|
||||
@@ -245,8 +246,9 @@ func applyDefaultSettings(settings *SettingsConfigType) {
|
||||
}
|
||||
if settings.AutoUpdate == nil {
|
||||
settings.AutoUpdate = &AutoUpdateOpts{
|
||||
Enabled: true,
|
||||
IntervalMs: 3600000,
|
||||
Enabled: true,
|
||||
InstallOnQuit: true,
|
||||
IntervalMs: 3600000,
|
||||
}
|
||||
}
|
||||
var userName string
|
||||
|
||||
Reference in New Issue
Block a user