Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for the new craft blueprint options relating to override server urls #7163

Merged
merged 1 commit into from
Sep 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions admin/osx/mac-crafter/Sources/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ struct Build: ParsableCommand {
@Option(name: [.long], help: "Sparkle package signing key.")
var sparklePackageSignKey: String?

@Option(name: [.long], help: "Override server url.")
var overrideServerUrl: String?

@Flag(help: "Reconfigure KDE Craft.")
var reconfigureCraft = false

Expand All @@ -101,6 +104,9 @@ struct Build: ParsableCommand {
@Flag(help: "Run a full rebuild.")
var fullRebuild = false

@Flag(help: "Force override server URL.")
var forceOverrideServerUrl = false

@Flag(help: "Create an installer package.")
var package = false

Expand Down Expand Up @@ -168,6 +174,11 @@ struct Build: ParsableCommand {
"\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")"
]

if let overrideServerUrl {
craftOptions.append("\(craftBlueprintName).overrideServerUrl=\(overrideServerUrl)")
craftOptions.append("\(craftBlueprintName).forceOverrideServerUrl=\(forceOverrideServerUrl ? "True" : "False")")
}

if !disableAutoUpdater {
print("Configuring Sparkle auto-updater.")

Expand Down
Loading