From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Fri, 20 Sep 2024 10:08:09 +0000 (+0800)
Subject: Fix work build path used in mac crafter packaging stage
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~6^2~11^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d21a294ad9eb42ea2113d26b958cf819af0d5d6;p=nextcloud-desktop.git

Fix work build path used in mac crafter packaging stage

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift
index f55ff77da..87bb3e354 100644
--- a/admin/osx/mac-crafter/Sources/main.swift
+++ b/admin/osx/mac-crafter/Sources/main.swift
@@ -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