chore(dtb): improve '.dtb' to '.dts' renaming

AndroidDumps · Nov 2, 2024 · 72b21a3 · 72b21a3
1 parent 89b9482
commit 72b21a3
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/extract_and_push.sh b/extract_and_push.sh
@@ -386,12 +386,13 @@ if [[ -f "${PWD}/boot.img" ]]; then
     extract-dtb "${IMAGE}" -o "${OUTPUT}/dtb" > /dev/null || echo "[INFO] No device-tree blobs found."
     rm -rf "${OUTPUT}/dtb/00_kernel"
 
-    # Do not run 'dtc' if no DTB was found
+    # Decompile '.dtb' to '.dts'
     if [ "$(find "${OUTPUT}/dtb" -name "*.dtb")" ]; then
         echo "[INFO] Decompiling device-tree blobs..."
         # Decompile '.dtb' to '.dts'
-        for dtb in $(find "${PWD}/boot/dtb" -type f); do
-            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb}" | sed 's/\.dtb/.dts/')" || echo "[ERROR] Failed to decompile."
+        for dtb in $(find "${OUTPUT}/dtb" -type f); do
+            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb%.*}".dts)" || \
+                echo "[ERROR] Failed to decompile."
         done
     fi
 fi
@@ -418,7 +419,8 @@ if [[ -f "${PWD}/vendor_boot.img" ]]; then
         echo "[INFO] Decompiling device-tree blobs..."
         # Decompile '.dtb' to '.dts'
         for dtb in $(find "${OUTPUT}/dtb" -type f); do
-            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb}" | sed 's/\.dtb/.dts/')" || echo "[ERROR] Failed to decompile."
+            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb%.*}".dts)" || \
+                echo "[ERROR] Failed to decompile."
         done
     fi
 
@@ -479,7 +481,8 @@ if [[ -f "${PWD}/vendor_kernel_boot.img" ]]; then
         echo "[INFO] Decompiling device-tree blobs..."
         # Decompile '.dtb' to '.dts'
         for dtb in $(find "${OUTPUT}/dtb" -type f); do
-            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb}" | sed 's/\.dtb/.dts/')" || echo "[ERROR] Failed to decompile."
+            dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb%.*}".dts)" || \
+                 echo "[ERROR] Failed to decompile."
         done
     fi
 fi
@@ -529,9 +532,10 @@ if [[ -f "${PWD}/dtbo.img" ]]; then
     rm -rf "${OUTPUT}/00_kernel"
 
     # Decompile '.dtb' to '.dts'
-    echo "[INFO] dbto.img: Decompiling device-tree blobs..."
-    for dtb in $(find "${OUTPUT}" -type f); do
-        dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb}" | sed 's/\.dtb/.dts/')" || echo "[ERROR] Failed to decompile."
+    echo "[INFO] Decompiling device-tree blobs..."
+    for dtb in $(find "${OUTPUT}/dtb" -type f); do
+        dtc -q -I dtb -O dts "${dtb}" >> "${OUTPUT}/dts/$(basename "${dtb%.*}".dts)" || \
+            echo "[ERROR] Failed to decompile."
     done
 fi