fix: use file-based merge for appcast to avoid awk newline errors

Author: datlechin

scripts/ci/sign-and-appcast.sh

@@ -117,7 +117,8 @@ else
   SECOND_APPCAST="${APPCAST_XMLS[1]}"
 
   # Extract <item>...</item> blocks for the current version from second appcast
-  NEW_ITEMS=$(awk "
+  ITEMS_FILE=$(mktemp)
+  awk "
     /<item>/ { capture=1; buf=\"\" }
     capture { buf = buf \$0 \"\\n\" }
     /<\\/item>/ {
@@ -126,28 +127,22 @@ else
         printf \"%s\", buf
       }
     }
-  " "$SECOND_APPCAST")
-
-  if [ -n "$NEW_ITEMS" ]; then
-    # Insert the new items after the first <item> block for this version
-    # (i.e., after the arm64 entry's closing </item>)
-    awk -v new_items="$NEW_ITEMS" -v version="$VERSION" '
-      BEGIN { inserted=0 }
-      /<\/item>/ {
-        print
-        if (!inserted && found_version) {
-          printf "%s", new_items
-          inserted=1
-        }
-        next
-      }
-      /<sparkle:shortVersionString>/ {
-        if (index($0, version) > 0) found_version=1
-      }
-      { print }
-    ' "$FINAL_APPCAST" > "${FINAL_APPCAST}.merged"
-    mv "${FINAL_APPCAST}.merged" "$FINAL_APPCAST"
+  " "$SECOND_APPCAST" > "$ITEMS_FILE"
+
+  if [ -s "$ITEMS_FILE" ]; then
+    # Find the line number of the first </item> in the base appcast and
+    # insert the second arch's item block right after it.
+    FIRST_CLOSE=$(grep -n '</item>' "$FINAL_APPCAST" | head -1 | cut -d: -f1)
+    if [ -n "$FIRST_CLOSE" ]; then
+      {
+        head -n "$FIRST_CLOSE" "$FINAL_APPCAST"
+        cat "$ITEMS_FILE"
+        tail -n +"$((FIRST_CLOSE + 1))" "$FINAL_APPCAST"
+      } > "${FINAL_APPCAST}.merged"
+      mv "${FINAL_APPCAST}.merged" "$FINAL_APPCAST"
+    fi
   fi
+  rm -f "$ITEMS_FILE"
 fi
 
 # ---------------------------------------------------------------------------