small fixes

n3d1117 · Dec 24, 2019 · 6991733 · 6991733
1 parent bb76e07
commit 6991733
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/cook/Recipes/CreateCertificate.swift b/cook/Recipes/CreateCertificate.swift
@@ -73,7 +73,7 @@ struct CreateCertificate: ExecutableRecipe {
                                         logger.log(.info, "Certificate already exists, revoking...")
                                         return revoke(cert: cert)
                                     } else {
-                                        logger.log(.error, "Certificate already exists! Aborting... (Use -f to force revoke)")
+                                        logger.log(.info, "Certificate already exists! Aborting... (Use -f to force revoke)")
                                         return _abort(CertificateError.certificateAlreadyExists)
                                     }
                                 } else {
@@ -83,10 +83,10 @@ struct CreateCertificate: ExecutableRecipe {
                                         if error.localizedDescription.contains("7460") {
                                             if self.force {
                                                 guard let cert = certs.first(where: { $0.name.contains("iPhone Developer") }) else { return _abort(CertificateError.missingCertificate) }
-                                                logger.log(.error, "Unable to add certificate, revoking \(cert)...")
+                                                logger.log(.info, "Unable to add certificate, revoking \(cert)...")
                                                 return revoke(cert: cert)
                                             } else {
-                                                logger.log(.error, "Error: You already have a current iOS Development certificate or a pending certificate request. Use -f to force revoke.")
+                                                logger.log(.info, "Error: You already have a current iOS Development certificate or a pending certificate request. Use -f to force revoke.")
                                                 return _abort(CertificateError.certificateAlreadyExists)
                                             }
                                         } else {
@@ -143,12 +143,14 @@ struct CreateCertificate: ExecutableRecipe {
                                             switch result {
                                             case .failure(let error as NSError):
                                                 return handle(error: error)
-                                            case .success(_):
+                                            case .success(let certAdded):
+                                                let privateKey: Data? = certAdded.privateKey
                                                 API.fetchCertificates(team: team, session: session) { result in
                                                     switch result {
                                                     case .failure(let error): return _abort(error)
                                                     case .success(let certs):
                                                         guard let cert = certs.first(where: { $0.machineName?.hasPrefix(self.machinePrefix) ?? false }) else { return _abort(CertificateError.missingCertificate) }
+                                                        cert.privateKey = privateKey
                                                         return save(cert: cert)
                                                     }
                                                 }

diff --git a/cook/Recipes/DownloadProvisioningProfiles.swift b/cook/Recipes/DownloadProvisioningProfiles.swift
@@ -47,7 +47,7 @@ struct DownloadProvisioningProfiles: ExecutableRecipe {
 
                                 switch result {
                                 case .failure(let error):
-                                    logger.log(.error, "Failed to download one profile: \(error)")
+                                    logger.log(.info, "Failed to download one profile: \(error)")
                                 case .success(let profile):
                                     logger.log(.verbose, "Saving mobileprovision...")
                                     logger.log(.verbose, "Expiration date: \(profile.expirationDate)")

diff --git a/cook/Recipes/RegisterBundleId.swift b/cook/Recipes/RegisterBundleId.swift
@@ -64,7 +64,7 @@ struct RegisterBundleId: ExecutableRecipe {
                                                 logger.log(.verbose, "App id removed successfully, resistering...")
                                                 return register()
                                             } else {
-                                                logger.log(.error, "Failed to delete app id")
+                                                logger.log(.info, "Failed to delete app id")
                                                 return _abort(AppIdError.failedToDeleteAppId)
                                             }
                                         }

diff --git a/cook/Recipes/UpdateProvisioningProfile.swift b/cook/Recipes/UpdateProvisioningProfile.swift
@@ -81,7 +81,7 @@ struct UpdateProvisioningProfile: ExecutableRecipe {
                                                     }
                                                 }
                                             } else {
-                                                logger.log(.error, "Failed to delete app id")
+                                                logger.log(.info, "Failed to delete app id")
                                                 return _abort(AppIdError.failedToDeleteAppId)
                                             }
                                         }
@@ -99,7 +99,7 @@ struct UpdateProvisioningProfile: ExecutableRecipe {
                                     }
                                 }
                             } else {
-                                logger.log(.error, "App id with bundle identifier \(self.bundleId) does not exist!")
+                                logger.log(.info, "App id with bundle identifier \(self.bundleId) does not exist!")
                                 return _abort(AppIdError.missingAppId)
                             }
                         }