Fix work build path used in mac crafter packaging stage
authorClaudio Cambra <claudio.cambra@nextcloud.com>
Fri, 20 Sep 2024 10:08:09 +0000 (18:08 +0800)
committerClaudio Cambra <claudio.cambra@nextcloud.com>
Tue, 24 Sep 2024 02:17:45 +0000 (10:17 +0800)
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
admin/osx/mac-crafter/Sources/main.swift

index f55ff77daf932d9639e30083e5335b4b83a4e8b4..87bb3e354fa1e1e6da53fb50dfe93ec49ed23de9 100644 (file)
@@ -193,7 +193,6 @@ struct Build: ParsableCommand {
 
         let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")
 
-        let buildWorkPath = "\(buildPath)/\(craftTarget)/build"
         let clientBuildDir = "\(buildPath)/\(craftTarget)/build/\(craftBlueprintName)"
         if fullRebuild {
             do {
@@ -230,8 +229,8 @@ struct Build: ParsableCommand {
 
         if package {
             print("Creating pkg file for client…")
-            let packagePath =
-            try buildPackage(
+            let buildWorkPath = "\(clientBuildDir)/work/build"
+            let packagePath = try buildPackage(
                 appName: appName,
                 buildWorkPath: buildWorkPath,
                 productPath: productPath