Fix script

Author: retlehs

scripts/migrate-from-wpackagist.sh

@@ -20,9 +20,15 @@ fi
 
 echo "Migrating $COMPOSER_FILE from WPackagist to WP Composer..."
 
+# Detect indent: find first indented line and count leading spaces
+INDENT=$(awk '/^[ \t]+[^ \t]/ { match($0, /^[ \t]+/); print RLENGTH; exit }' "$COMPOSER_FILE")
+if [[ -z "$INDENT" || "$INDENT" -lt 1 ]]; then
+  INDENT=4
+fi
+
 # Rename wpackagist-plugin/* → wp-plugin/* and wpackagist-theme/* → wp-theme/*
-# in both require and require-dev, then swap the repository entry
-jq '
+# in require, require-dev, and extra.patches, then swap the repository entry
+jq --indent "$INDENT" '
   # Rename package keys in a given object
   def rename_packages:
     to_entries | map(
@@ -40,26 +46,42 @@ jq '
   # Rename packages in require-dev
   (if .["require-dev"] then .["require-dev"] |= rename_packages else . end) |
 
-  # Replace wpackagist repository with wp-composer
+  # Rename packages in extra.patches (composer-patches plugin)
+  (if .extra.patches then .extra.patches |= rename_packages else . end) |
+
+  # Filter out wpackagist repo entry
+  def is_wpackagist:
+    (.url // "" | test("wpackagist\\.org")) or ((.name // "") == "wpackagist");
+
+  # WP Composer repo entry
+  def wp_composer_repo:
+    {
+      "name": "wp-composer",
+      "type": "composer",
+      "url": "https://wp-composer.com",
+      "only": ["wp-plugin/*", "wp-theme/*"]
+    };
+
+  # Replace wpackagist repository with wp-composer (handles both array and object formats)
   (if .repositories then
-    .repositories = [
-      (.repositories[] | select(
-        (.url // "" | test("wpackagist\\.org") | not) and
-        ((.name // "") != "wpackagist")
-      )),
-      {
-        "name": "wp-composer",
-        "type": "composer",
-        "url": "https://wp-composer.com",
-        "only": ["wp-plugin/*", "wp-theme/*"]
-      }
-    ]
+    if (.repositories | type) == "array" then
+      .repositories = [(.repositories[] | select(is_wpackagist | not)), wp_composer_repo]
+    else
+      # Object format: remove wpackagist entries by key, add wp-composer
+      .repositories |= (
+        to_entries
+        | map(select(.value | is_wpackagist | not))
+        | from_entries
+      )
+      | .repositories["wp-composer"] = (wp_composer_repo | del(.name))
+    end
   else . end)
 ' "$COMPOSER_FILE" > "${COMPOSER_FILE}.tmp" && mv "${COMPOSER_FILE}.tmp" "$COMPOSER_FILE"
 
 echo "Done! Changes made to $COMPOSER_FILE:"
 echo "  - Renamed wpackagist-plugin/* → wp-plugin/*"
 echo "  - Renamed wpackagist-theme/* → wp-theme/*"
+echo "  - Renamed wpackagist-plugin/*, wpackagist-theme/* in extra.patches"
 echo "  - Replaced WPackagist repository with WP Composer"
 echo ""
 echo "Run 'composer update' to install packages from WP Composer."