Fix notarytool args

JetBrains · Sep 8, 2023 · 6d25db5 · 6d25db5
1 parent aa4c88d
commit 6d25db5
Showing 1 changed file with 10 additions and 21 deletions.
diff --git a/...c/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt b/...c/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt
@@ -49,27 +49,16 @@ abstract class AbstractNotarizationTask @Inject constructor(
         packageFile: File
     ) {
         logger.info("Uploading '${packageFile.name}' for notarization")
-
-        val args = arrayListOf<String>().apply {
-            add("notarytool")
-            add("submit")
-            add("notarytool")
-            add("--wait")
-            add("--apple-id")
-            addAll(listOf(
-                "notarytool",
-                "submit",
-                "--wait",
-                "--apple-id",
-                notarization.appleID
-            ))
-            if (notarization.teamID != null) {
-                add("--team-id")
-                add(notarization.teamID)
-            }
-            add(packageFile.absolutePath)
-        }
-
+        val args = listOfNotNull(
+            "notarytool",
+            "submit",
+            "--wait",
+            "--apple-id",
+            notarization.appleID,
+            "--team-id".takeIf { notarization.teamID != null },
+            notarization.teamID,
+            packageFile.absolutePath
+        )
         runExternalTool(tool = MacUtils.xcrun, args = args, stdinStr = notarization.password)
     }