Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-06-25 08:48:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

macos: make auto-update optional

Browse Source 
When unset, we use Sparkle's default behavior, which is based on the
user's preference stored in the standard user defaults.

The rest of the previous behavior is preserved:
- When SUEnableAutomaticChecks is explicitly false, auto-updates are
  disabled.
- When 'auto-update' is set, use its value to set Sparkle's auto-update
  behavior.
This commit is contained in:
Jon Parise
2025-01-02 15:47:56 -05:00
parent b68e9a10e0
commit 713dd24ab9
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
macos/Sources/App/macOS/AppDelegate.swift
View File

@ -486,15 +486,16 @@ class AppDelegate: NSObject,
// Sync our auto-update settings. If SUEnableAutomaticChecks (in our Info.plist) is // Sync our auto-update settings. If SUEnableAutomaticChecks (in our Info.plist) is
// explicitly false (NO), auto-updates are disabled. Otherwise, we use the behavior // explicitly false (NO), auto-updates are disabled. Otherwise, we use the behavior
// defined by our "auto-update" configuration. // defined by our "auto-update" configuration (if set) or fall back to Sparkle
if Bundle.main.infoDictionary?["SUEnableAutomaticChecks"] as? Bool != false { // user-based defaults.
updaterController.updater.automaticallyChecksForUpdates = if Bundle.main.infoDictionary?["SUEnableAutomaticChecks"] as? Bool == false {
config.autoUpdate == .check || config.autoUpdate == .download
updaterController.updater.automaticallyDownloadsUpdates =
config.autoUpdate == .download
} else {
updaterController.updater.automaticallyChecksForUpdates = false updaterController.updater.automaticallyChecksForUpdates = false
updaterController.updater.automaticallyDownloadsUpdates = false updaterController.updater.automaticallyDownloadsUpdates = false
} else if let autoUpdate = config.autoUpdate {
updaterController.updater.automaticallyChecksForUpdates =
autoUpdate == .check || autoUpdate == .download
updaterController.updater.automaticallyDownloadsUpdates =
autoUpdate == .download
} }
// Config could change keybindings, so update everything that depends on that // Config could change keybindings, so update everything that depends on that

11
macos/Sources/Ghostty/Ghostty.Config.swift
View File

@ -437,15 +437,14 @@ extension Ghostty {
return v; return v;
} }
var autoUpdate: AutoUpdate { var autoUpdate: AutoUpdate? {
let defaultValue = AutoUpdate.check guard let config = self.config else { return nil }
guard let config = self.config else { return defaultValue }
var v: UnsafePointer<Int8>? = nil var v: UnsafePointer<Int8>? = nil
let key = "auto-update" let key = "auto-update"
guard ghostty_config_get(config, &v, key, UInt(key.count)) else { return defaultValue } guard ghostty_config_get(config, &v, key, UInt(key.count)) else { return nil }
guard let ptr = v else { return defaultValue } guard let ptr = v else { return nil }
let str = String(cString: ptr) let str = String(cString: ptr)
return AutoUpdate(rawValue: str) ?? defaultValue return AutoUpdate(rawValue: str)
} }
var autoUpdateChannel: AutoUpdateChannel { var autoUpdateChannel: AutoUpdateChannel {

5
src/config/Config.zig
View File

@ -1967,10 +1967,11 @@ term: []const u8 = "xterm-ghostty",
/// * `download` - Check for updates, automatically download the update, /// * `download` - Check for updates, automatically download the update,
/// notify the user, but do not automatically install the update. /// notify the user, but do not automatically install the update.
/// ///
/// The default value is `check`. /// If unset, we defer to Sparkle's default behavior, which respects the
/// preference stored in the standard user defaults (`defaults(1)`).
/// ///
/// Changing this value at runtime works after a small delay. /// Changing this value at runtime works after a small delay.
@"auto-update": AutoUpdate = .check, @"auto-update": ?AutoUpdate = null,
/// The release channel to use for auto-updates. /// The release channel to use for auto-updates.
/// ///