Use appName for packaging step in mac-crafter

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

diff --git a/admin/osx/mac-crafter/Sources/Utils/Packaging.swift b/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
index 1147f74237b22ec327487bc8b3ad6247093adcf7..73232e1672c874230882c294816d4a4352c63f1a 100644 (file)
--- a/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
+++ b/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
@@ -23,13 +23,12 @@ enum PackagingError: Error {
     case packageSparkleSignError(String)
 }
 
-func buildPackage(buildWorkPath: String, productPath: String) throws -> String {
-    let projectName = "Nextcloud" // TODO: Get specific name
-    let packageFile = "\(projectName).pkg"
+func buildPackage(appName: String, buildWorkPath: String, productPath: String) throws -> String {
+    let packageFile = "\(appName).pkg"
     let sparkleFile = "\(packageFile).tbz"
     let pkgprojPath = "\(buildWorkPath)/admin/osx/macosx.pkgproj"
 
-    guard shell("packagesutil --file \(pkgprojPath) set project name \(projectName)") == 0 else {
+    guard shell("packagesutil --file \(pkgprojPath) set project name \(appName)") == 0 else {
         throw PackagingError.projectNameSettingError("Could not set project name in pkgproj!")
     }
     guard shell("packagesbuild -v --build-folder \(productPath) -F \(productPath) \(pkgprojPath)") == 0 else {

diff --git a/admin/osx/mac-crafter/Sources/main.swift b/admin/osx/mac-crafter/Sources/main.swift
index d28b12bc7b1b72371e756f7329f4458aab1abf2c..f55ff77daf932d9639e30083e5335b4b83a4e8b4 100644 (file)
--- a/admin/osx/mac-crafter/Sources/main.swift
+++ b/admin/osx/mac-crafter/Sources/main.swift
@@ -189,7 +189,7 @@ struct Build: ParsableCommand {
             )
         }
 
-        print("Crafting Nextcloud Desktop Client...")
+        print("Crafting \(appName) Desktop Client...")
 
         let allOptionsString = craftOptions.map({ "--options \"\($0)\"" }).joined(separator: " ")
 
@@ -231,7 +231,11 @@ struct Build: ParsableCommand {
         if package {
             print("Creating pkg file for client…")
             let packagePath =
-                try buildPackage(buildWorkPath: buildWorkPath, productPath: productPath)
+            try buildPackage(
+                appName: appName,
+                buildWorkPath: buildWorkPath,
+                productPath: productPath
+            )
 
             if let packageSigningId {
                 print("Signing pkg with \(packageSigningId)…")