From 2df5533aa3c6bb57c4b8ff999399d57d76da677f Mon Sep 17 00:00:00 2001
From: EdwardWu <bluehome.wu@gmail.com>
Date: Sun, 19 Jul 2026 03:23:29 +0800
Subject: [PATCH 1/3] fix(prop): correct system platform lookup

Remove the stray rg prefix from the ro.system.board.platform search so the fallback command is valid.
---
 dumpyara.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dumpyara.sh b/dumpyara.sh
index 8ef0fe1..fe2ef66 100755
--- a/dumpyara.sh
+++ b/dumpyara.sh
@@ -350,7 +350,7 @@ tags=$(echo "$tags" | head -1)
 # 'platform' property (e.g. zumapro)
 platform=$(rg -m1 -INoP --no-messages "(?<=^ro.board.platform=).*" {vendor,system,system/system}/build*.prop | head -1)
 [[ -z ${platform} ]] && platform=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.board.platform=).*" vendor/build*.prop)
-[[ -z ${platform} ]] && platform=$(rg -m1 -INoP --no-messages rg"(?<=^ro.system.board.platform=).*" {system,system/system}/build*.prop)
+[[ -z ${platform} ]] && platform=$(rg -m1 -INoP --no-messages "(?<=^ro.system.board.platform=).*" {system,system/system}/build*.prop)
 platform=$(echo "$platform" | head -1)
 
 # 'manufacturer' property (e.g. google)

From 0c8d9261e94f3a2e0138ecd9b9fe21e00302d027 Mon Sep 17 00:00:00 2001
From: EdwardWu <bluehome.wu@gmail.com>
Date: Sun, 19 Jul 2026 03:24:21 +0800
Subject: [PATCH 2/3] fix(prop): fallback to extracted build props

Collect build prop files from the extracted tree and use them as a final fallback for README metadata when vendor/system fixed-path lookups do not find a value.
---
 dumpyara.sh | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/dumpyara.sh b/dumpyara.sh
index fe2ef66..8fa97a9 100755
--- a/dumpyara.sh
+++ b/dumpyara.sh
@@ -305,17 +305,40 @@ LOGI "Generating 'all_files.txt'..."
 find . -type f ! -name all_files.txt \
      -printf '%P\n' | sort | grep -v ".git/" > ./all_files.txt
 
+PROP_FILES=()
+while IFS= read -r -d '' prop_file; do
+    PROP_FILES+=("${prop_file#./}")
+done < <(find . -path './.git' -prune -o -type f \( -name 'build.prop' -o -name 'build_*.prop' -o -name '*build*.prop' \) -print0 | sort -z)
+
+prop_value() {
+    local key escaped_key value
+    ((${#PROP_FILES[@]})) || return 1
+
+    for key in "$@"; do
+        escaped_key=${key//./\\.}
+        value=$(rg -m1 -INoP --no-messages "^${escaped_key}=\\K.*" "${PROP_FILES[@]}" | head -1)
+        if [[ -n ${value} ]]; then
+            printf '%s\n' "${value}"
+            return 0
+        fi
+    done
+
+    return 1
+}
+
 # 'flavor' property (e.g. caiman-user)
 flavor=$(rg -m1 -INoP --no-messages "(?<=^ro.build.flavor=).*" {vendor,system,system/system}/build.prop)
 [[ -z ${flavor} ]] && flavor=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.flavor=).*" vendor/build*.prop)
 [[ -z ${flavor} ]] && flavor=$(rg -m1 -INoP --no-messages "(?<=^ro.build.flavor=).*" {vendor,system,system/system}/build*.prop)
 [[ -z ${flavor} ]] && flavor=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.flavor=).*" {system,system/system}/build*.prop)
 [[ -z ${flavor} ]] && flavor=$(rg -m1 -INoP --no-messages "(?<=^ro.build.type=).*" {system,system/system}/build*.prop)
+[[ -z ${flavor} ]] && flavor=$(prop_value ro.build.flavor ro.vendor.build.flavor ro.system.build.flavor ro.build.type)
 
 # 'release' property (e.g. 15)
 release=$(rg -m1 -INoP --no-messages "(?<=^ro.build.version.release=).*" {my_manifest,vendor,system,system/system}/build*.prop)
 [[ -z ${release} ]] && release=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.version.release=).*" vendor/build*.prop)
 [[ -z ${release} ]] && release=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.version.release=).*" {system,system/system}/build*.prop)
+[[ -z ${release} ]] && release=$(prop_value ro.build.version.release ro.vendor.build.version.release ro.system.build.version.release)
 release=$(echo "$release" | head -1)
 
 # 'id' property (e.g. AP4A.241205.013)
@@ -325,6 +348,7 @@ id=$(rg -m1 -INoP --no-messages "(?<=^ro.build.id=).*" my_manifest/build*.prop)
 [[ -z ${id} ]] && id=$(rg -m1 -INoP --no-messages "(?<=^ro.build.id=).*" {vendor,system,system/system}/build*.prop)
 [[ -z ${id} ]] && id=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.id=).*" vendor/build*.prop)
 [[ -z ${id} ]] && id=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.id=).*" {system,system/system}/build*.prop)
+[[ -z ${id} ]] && id=$(prop_value ro.build.id ro.vendor.build.id ro.system.build.id)
 id=$(echo "$id" | head -1)
 
 # 'incremental' property (e.g. 12621605)
@@ -339,18 +363,21 @@ incremental=$(rg -m1 -INoP --no-messages "(?<=^ro.build.version.incremental=).*"
 [[ -z ${incremental} ]] && incremental=$(rg -m1 -INoP --no-messages "(?<=^ro.build.version.incremental=).*" my_product/build*.prop)
 [[ -z ${incremental} ]] && incremental=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.version.incremental=).*" my_product/build*.prop)
 [[ -z ${incremental} ]] && incremental=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.version.incremental=).*" my_product/build*.prop)
+[[ -z ${incremental} ]] && incremental=$(prop_value ro.build.version.incremental ro.vendor.build.version.incremental ro.system.build.version.incremental)
 incremental=$(echo "$incremental" | head -1)
 
 # 'tags' property (e.g. release-keys)
 tags=$(rg -m1 -INoP --no-messages "(?<=^ro.build.tags=).*" {vendor,system,system/system}/build*.prop)
 [[ -z ${tags} ]] && tags=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.tags=).*" vendor/build*.prop)
 [[ -z ${tags} ]] && tags=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.tags=).*" {system,system/system}/build*.prop)
+[[ -z ${tags} ]] && tags=$(prop_value ro.build.tags ro.vendor.build.tags ro.system.build.tags)
 tags=$(echo "$tags" | head -1)
 
 # 'platform' property (e.g. zumapro)
 platform=$(rg -m1 -INoP --no-messages "(?<=^ro.board.platform=).*" {vendor,system,system/system}/build*.prop | head -1)
 [[ -z ${platform} ]] && platform=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.board.platform=).*" vendor/build*.prop)
 [[ -z ${platform} ]] && platform=$(rg -m1 -INoP --no-messages "(?<=^ro.system.board.platform=).*" {system,system/system}/build*.prop)
+[[ -z ${platform} ]] && platform=$(prop_value ro.board.platform ro.vendor.board.platform ro.system.board.platform)
 platform=$(echo "$platform" | head -1)
 
 # 'manufacturer' property (e.g. google)
@@ -378,6 +405,7 @@ manufacturer=$(rg -m1 -INoP --no-messages "(?<=^ro.product.odm.manufacturer=).*"
 [[ -z ${manufacturer} ]] && manufacturer=$(rg -m1 -INoP --no-messages "(?<=^ro.product.manufacturer=).*" vendor/euclid/*/build.prop)
 [[ -z ${manufacturer} ]] && manufacturer=$(rg -m1 -INoP --no-messages "(?<=^ro.system.product.manufacturer=).*" vendor/euclid/*/build.prop)
 [[ -z ${manufacturer} ]] && manufacturer=$(rg -m1 -INoP --no-messages "(?<=^ro.product.product.manufacturer=).*" vendor/euclid/product/build*.prop)
+[[ -z ${manufacturer} ]] && manufacturer=$(prop_value ro.product.manufacturer ro.product.vendor.manufacturer ro.vendor.product.manufacturer ro.product.system.manufacturer ro.system.product.manufacturer ro.product.product.manufacturer ro.product.odm.manufacturer)
 manufacturer=$(echo "$manufacturer" | head -1)
 
 # 'fingerprint' property (e.g. google/caiman/caiman:15/AP4A.241205.013/12621605:user/release-keys)
@@ -396,6 +424,7 @@ fingerprint=$(rg -m1 -INoP --no-messages "(?<=^ro.odm.build.fingerprint=).*" odm
 [[ -z ${fingerprint} ]] && fingerprint=$(rg -m1 -INoP --no-messages "(?<=^ro.build.fingerprint=).*" my_product/build.prop)
 [[ -z ${fingerprint} ]] && fingerprint=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.fingerprint=).*" my_product/build.prop)
 [[ -z ${fingerprint} ]] && fingerprint=$(rg -m1 -INoP --no-messages "(?<=^ro.vendor.build.fingerprint=).*" my_product/build.prop)
+[[ -z ${fingerprint} ]] && fingerprint=$(prop_value ro.build.fingerprint ro.system.build.fingerprint ro.vendor.build.fingerprint ro.product.build.fingerprint ro.odm.build.fingerprint)
 fingerprint=$(echo "$fingerprint" | head -1)
 
 # 'codename' property (e.g. caiman)
@@ -425,6 +454,7 @@ codename=$(rg -m1 -INoP --no-messages "(?<=^ro.product.odm.device=).*" odm/etc/b
 [[ -z ${codename} ]] && codename=$(rg -m1 -INoP --no-messages "(?<=^ro.product.vendor.device=).*" my_product/build*.prop)
 [[ -z ${codename} ]] && codename=$(rg -m1 -INoP --no-messages "(?<=^ro.build.fota.version=).*" {system,system/system}/build*.prop | cut -d - -f1 | head -1)
 [[ -z ${codename} ]] && codename=$(rg -m1 -INoP --no-messages "(?<=^ro.build.product=).*" {vendor,system,system/system}/build*.prop | head -1)
+[[ -z ${codename} ]] && codename=$(prop_value ro.product.device ro.product.vendor.device ro.vendor.product.device ro.product.system.device ro.product.product.device ro.product.odm.device ro.build.product)
 [[ -z ${codename} ]] && codename=$(echo "$fingerprint" | cut -d / -f3 | cut -d : -f1)
 
 # 'brand' property (e.g. google)
@@ -450,6 +480,7 @@ brand=$(rg -m1 -INoP --no-messages "(?<=^ro.product.odm.brand=).*" odm/etc/"${co
 [[ -z ${brand} ]] && brand=$(rg -m1 -INoP --no-messages "(?<=^ro.product.odm.brand=).*" vendor/euclid/my_manifest/build.prop)
 [[ -z ${brand} ]] && brand=$(rg -m1 -INoP --no-messages "(?<=^ro.product.odm.brand=).*" vendor/odm/etc/build*.prop)
 [[ -z ${brand} ]] && brand=$(rg -m1 -INoP --no-messages "(?<=^ro.product.brand=).*" {oppo_product,my_product}/build*.prop | head -1)
+[[ -z ${brand} ]] && brand=$(prop_value ro.product.brand ro.product.vendor.brand ro.vendor.product.brand ro.product.system.brand ro.product.product.brand ro.product.odm.brand)
 [[ -z ${brand} ]] && brand=$(echo "$fingerprint" | cut -d / -f1)
 [[ -z ${brand} ]] && brand="$manufacturer"
 
@@ -461,6 +492,7 @@ description=$(rg -m1 -INoP --no-messages "(?<=^ro.build.description=).*" {system
 [[ -z ${description} ]] && description=$(rg -m1 -INoP --no-messages "(?<=^ro.product.build.description=).*" product/build.prop)
 [[ -z ${description} ]] && description=$(rg -m1 -INoP --no-messages "(?<=^ro.product.build.description=).*" product/build*.prop)
 [[ -z ${description} ]] && description=$(rg -m1 -INoP --no-messages "(?<=^ro.system.build.description=).*" {system,system/system}/build*.prop)
+[[ -z ${description} ]] && description=$(prop_value ro.build.description ro.system.build.description ro.vendor.build.description ro.product.build.description)
 [[ -z ${description} ]] && description="$flavor $release $id $incremental $tags"
 
 # Generate dummy device tree
@@ -470,6 +502,7 @@ uvx aospdtgen . --output "${WORKING}/aosp-device-tree" >> /dev/null 2>&1 || \
     LOGE "Failed to generate AOSP device tree" && rm -rf "${WORKING}/aosp-device-tree"
 
 is_ab=$(grep -oP "(?<=^ro.build.ab_update=).*" -hs {system,system/system,vendor}/build*.prop | head -1)
+[[ -z "${is_ab}" ]] && is_ab=$(prop_value ro.build.ab_update)
 [[ -z "${is_ab}" ]] && is_ab="false"
 branch=$(echo "$description" | tr ' ' '-')
 repo=$(echo "$brand"_"$codename"_dump | tr '[:upper:]' '[:lower:]' | tr -d '\r\n')

From f9d7d6723d2ca26a912a24491775ed127b94644c Mon Sep 17 00:00:00 2001
From: EdwardWu <bluehome.wu@gmail.com>
Date: Sun, 19 Jul 2026 03:24:34 +0800
Subject: [PATCH 3/3] fix(mtk): keep raw modem images

Detect MediaTek md1rom/MOLY modem blobs and keep modem.img as-is instead of trying to extract it as an archive or filesystem image.
---
 dumpyara.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dumpyara.sh b/dumpyara.sh
index 8fa97a9..b8d2586 100755
--- a/dumpyara.sh
+++ b/dumpyara.sh
@@ -166,11 +166,22 @@ PARTITIONS=(system systemex system_ext system_other vendor cust odm odm_ext oem
     product_h preas preavs preload
 )
 
+is_raw_mtk_modem_image() {
+    local image=$1
+
+    head -c 1048576 "${image}" 2>/dev/null | strings -n 5 | rg -q '^(md1rom|MOLY\.)'
+}
+
 # Extract the images
 LOGI "Extracting partitions..."
 for partition in "${PARTITIONS[@]}"; do
     # Proceed only if the image from 'PARTITIONS' array exists
     if [[ -f "${partition}".img ]]; then
+        if [[ "${partition}" == "modem" ]] && is_raw_mtk_modem_image "${partition}.img"; then
+            LOGI "Raw MediaTek 'modem.img' detected; keeping image as-is."
+            continue
+        fi
+
         # Try to extract file through '7z'
         ${FSCK_EROFS} --extract="${partition}" "${partition}".img >> /dev/null 2>&1 || {
                 # Try to extract file through '7z'