Fix signing settings when no Keychain is specified - Fixed (#1152)

Closes #1086 Closes #1020
JetBrains · Sep 11, 2021 · 8371226 · 8371226
1 parent 68d2040
commit 8371226
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...etbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt b/...etbrains/compose/desktop/application/internal/validation/ValidatedMacOSSigningSettings.kt
@@ -44,14 +44,14 @@ internal fun MacOSSigningSettings.validate(
     val signIdentity = this.identity.orNull
         ?: error(ERR_UNKNOWN_SIGN_ID)
     val keychainPath = this.keychain.orNull
-    val keychainFile =
-        listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
+    val keychainFile = if (keychainPath != null) {
+        val keychainFile = listOf(project.file(keychainPath), project.rootProject.file(keychainPath))
             .firstOrNull { it.exists() }
-    if (keychainPath != null) {
-        check(keychainFile != null && keychainFile.exists()) {
+        check(keychainFile != null) {
             "$ERR_PREFIX could not find the specified keychain: $keychainPath"
         }
-    }
+        keychainFile
+    } else null
 
     return ValidatedMacOSSigningSettings(
         bundleID = bundleID,