From facec09fa84b271d901424c63ab3b3df27dfc6a3 Mon Sep 17 00:00:00 2001
From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Fri, 20 Sep 2024 18:46:01 +0800
Subject: [PATCH] Make specific step functions for packaging fileprivate in mac
 crafter

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

diff --git a/admin/osx/mac-crafter/Sources/Utils/Packaging.swift b/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
index 2e851a021b..6981eec3aa 100644
--- a/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
+++ b/admin/osx/mac-crafter/Sources/Utils/Packaging.swift
@@ -23,7 +23,7 @@ enum PackagingError: Error {
     case packageSparkleSignError(String)
 }
 
-func buildPackage(appName: String, buildWorkPath: String, productPath: String) throws -> String {
+fileprivate func buildPackage(appName: String, buildWorkPath: String, productPath: String) throws -> String {
     let packageFile = "\(appName).pkg"
     let pkgprojPath = "\(buildWorkPath)/admin/osx/macosx.pkgproj"
 
@@ -36,7 +36,7 @@ func buildPackage(appName: String, buildWorkPath: String, productPath: String) t
     return "\(productPath)/\(packageFile)"
 }
 
-func signPackage(packagePath: String, packageSigningId: String) throws {
+fileprivate func signPackage(packagePath: String, packageSigningId: String) throws {
     let packagePathNew = "\(packagePath).new"
     guard shell("productsign --timestamp --sign '\(packageSigningId)' \(packagePath) \(packagePathNew)") == 0 else {
         throw PackagingError.packageSigningError("Could not sign pkg file!")
@@ -46,7 +46,7 @@ func signPackage(packagePath: String, packageSigningId: String) throws {
     try fm.moveItem(atPath: packagePathNew, toPath: packagePath)
 }
 
-func notarisePackage(
+fileprivate func notarisePackage(
     packagePath: String, appleId: String, applePassword: String, appleTeamId: String
 ) throws {
     guard shell("xcrun notarytool submit \(packagePath) --apple-id \(appleId) --password \(applePassword) --team-id \(appleTeamId) --wait") == 0 else {
@@ -57,7 +57,7 @@ func notarisePackage(
     }
 }
 
-func buildSparklePackage(packagePath: String, buildPath: String) throws -> String {
+fileprivate func buildSparklePackage(packagePath: String, buildPath: String) throws -> String {
     let sparkleTbzPath = "\(packagePath).tbz"
     guard shell("tar cf \(sparkleTbzPath) \(packagePath)") == 0 else {
         throw PackagingError.packageSparkleBuildError("Could not create Sparkle package tbz!")
@@ -65,8 +65,7 @@ func buildSparklePackage(packagePath: String, buildPath: String) throws -> Strin
     return sparkleTbzPath
 }
 
-func signSparklePackage(sparkleTbzPath: String, buildPath: String, signKey: String) throws
-{
+fileprivate func signSparklePackage(sparkleTbzPath: String, buildPath: String, signKey: String) throws {
     guard shell("\(buildPath)/bin/sign_update -s \(signKey) \(sparkleTbzPath)") == 0 else {
         throw PackagingError.packageSparkleSignError("Could not sign Sparkle package tbz!")
     }