From 38ae38c5c95300579eae8a8a1f915cb6eef15047 Mon Sep 17 00:00:00 2001
From: Pete Fotheringham <petefoth@e.email>
Date: Fri, 6 Oct 2023 12:07:07 +0100
Subject: [PATCH] Revert the changes made for #483 - fixes #487 *#488

---
 src/build.sh | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/build.sh b/src/build.sh
index f735d5ed..0d9ee30c 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -229,7 +229,7 @@ for branch in ${BRANCH_NAME//,/ }; do
         git clean -q -f
         cd ../../..
       fi
-      
+
       if [ -n "$modules_permission_patch" ] && [ "$SIGNATURE_SPOOFING" = "yes" ]; then
         cd packages/modules/Permission
         echo ">> [$(date)] Applying the modules/Permission patch ($modules_permission_patch) to packages/modules/Permission"
@@ -370,24 +370,16 @@ for branch in ${BRANCH_NAME//,/ }; do
             mv "$build" "$ZIP_DIR/$zipsubdir/" &>> "$DEBUG_LOG"
             files_to_hash+=( "$build" )
           done
-
-          # Now for the 'img' files
-          files_to_zip=()
-          images_zip_file="lineage-$los_ver-$builddate-$RELEASE_TYPE-$codename-images.zip"
           cd "$source_dir/out/target/product/$codename/obj/PACKAGING/target_files_intermediates/lineage_$codename-target_files-eng.root/IMAGES/"
-  
+
           for image in recovery boot vendor_boot dtbo super_empty vbmeta vendor_kernel_boot; do
             if [ -f "$image.img" ]; then
-              echo ">> [$(date)] Adding $image.img" to "$images_zip_file" | tee -a "$DEBUG_LOG"
-              files_to_zip+=( "$image.img" )
+              recovery_name="lineage-$los_ver-$builddate-$RELEASE_TYPE-$codename-$image.img"
+              echo ">> [$(date)] Copying $image.img" to "$ZIP_DIR/$zipsubdir/$recovery_name" >> "$DEBUG_LOG"
+              cp "$image.img" "$ZIP_DIR/$zipsubdir/$recovery_name" &>> "$DEBUG_LOG"
+              files_to_hash+=( "$recovery_name" )
             fi
           done
-
-          zip "$images_zip_file" "${files_to_zip[@]}"
-          mv "$images_zip_file" "$ZIP_DIR/$zipsubdir/"
-          files_to_hash+=( "$images_zip_file" )
-
-          # now make the hashes
           cd "$ZIP_DIR/$zipsubdir"
           for f in "${files_to_hash[@]}"; do
             sha256sum "$f" > "$ZIP_DIR/$zipsubdir/$f.sha256sum"