mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-24 14:05:58 +03:00
Merge pull request #7163 from nextcloud/feature/mac-crafter-override-server-url
Add support for the new craft blueprint options relating to override server urls
This commit is contained in:
commit
5625df7304
1 changed files with 11 additions and 0 deletions
|
@ -80,6 +80,9 @@ struct Build: ParsableCommand {
|
||||||
@Option(name: [.long], help: "Sparkle package signing key.")
|
@Option(name: [.long], help: "Sparkle package signing key.")
|
||||||
var sparklePackageSignKey: String?
|
var sparklePackageSignKey: String?
|
||||||
|
|
||||||
|
@Option(name: [.long], help: "Override server url.")
|
||||||
|
var overrideServerUrl: String?
|
||||||
|
|
||||||
@Flag(help: "Reconfigure KDE Craft.")
|
@Flag(help: "Reconfigure KDE Craft.")
|
||||||
var reconfigureCraft = false
|
var reconfigureCraft = false
|
||||||
|
|
||||||
|
@ -101,6 +104,9 @@ struct Build: ParsableCommand {
|
||||||
@Flag(help: "Run a full rebuild.")
|
@Flag(help: "Run a full rebuild.")
|
||||||
var fullRebuild = false
|
var fullRebuild = false
|
||||||
|
|
||||||
|
@Flag(help: "Force override server URL.")
|
||||||
|
var forceOverrideServerUrl = false
|
||||||
|
|
||||||
@Flag(help: "Create an installer package.")
|
@Flag(help: "Create an installer package.")
|
||||||
var package = false
|
var package = false
|
||||||
|
|
||||||
|
@ -168,6 +174,11 @@ struct Build: ParsableCommand {
|
||||||
"\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")"
|
"\(craftBlueprintName).buildFileProviderModule=\(buildFileProviderModule ? "True" : "False")"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
if let overrideServerUrl {
|
||||||
|
craftOptions.append("\(craftBlueprintName).overrideServerUrl=\(overrideServerUrl)")
|
||||||
|
craftOptions.append("\(craftBlueprintName).forceOverrideServerUrl=\(forceOverrideServerUrl ? "True" : "False")")
|
||||||
|
}
|
||||||
|
|
||||||
if !disableAutoUpdater {
|
if !disableAutoUpdater {
|
||||||
print("Configuring Sparkle auto-updater.")
|
print("Configuring Sparkle auto-updater.")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue