From 5d21a294ad9eb42ea2113d26b958cf819af0d5d6 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Fri, 20 Sep 2024 18:08:09 +0800
Subject: [PATCH] Fix work build path used in mac crafter packaging stage

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---
 admin/osx/mac-crafter/Sources/main.swift | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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
-- 
2.30.2