feat(extracting): Switch from 7z (p7zip) to 7zz (7zip)

AndroidDumps · Sep 23, 2024 · 6dc97fa · 6dc97fa
1 parent d3105ff
commit 6dc97fa
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/extract_and_push.sh b/extract_and_push.sh
@@ -206,13 +206,13 @@ else
             echo "Trying to extract $p partition via fsck.erofs."
             ~/Firmware_extractor/tools/Linux/bin/fsck.erofs --extract="$p" "$p".img || {
 
-                # Uses '7z' if images could not be extracted via 'fsck.erofs'
-                echo "Extraction via fsck.erofs failed, extracting $p partition via 7z"
-                7z x "$p".img -y -o"$p"/ || {
+                # Uses '7zz' if images could not be extracted via 'fsck.erofs'
+                echo "Extraction via fsck.erofs failed, extracting $p partition via 7zz"
+                7zz x "$p".img -y -o"$p"/ || {
 
-                    # Uses mount 'loop' if extraction via '7z' failed
+                    # Uses mount 'loop' if extraction via '7zz' failed
                     rm -rf "${p}"/*
-                    echo "Couldn't extract $p partition via 7z. Using mount loop"
+                    echo "Couldn't extract $p partition via 7zz. Using mount loop"
                     mount -o loop -t auto "$p".img "$p"
                     mkdir "${p}_"
                     cp -rf "${p}/*" "${p}_"
@@ -301,7 +301,7 @@ if [[ -f "${PWD}/boot.img" ]]; then
         ## Run only if 'boot.img-ramdisk' is not empty
         if [[ $(file boot.img-ramdisk | grep LZ4) || $(file boot.img-ramdisk | grep gzip) ]]; then
             unlz4 "${OUTPUT}/boot.img-ramdisk" "${OUTPUT}/ramdisk.lz4"
-            7z x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
+            7zzz x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
 
             ## Clean-up
             rm -rf "${OUTPUT}/ramdisk.lz4"
@@ -344,7 +344,7 @@ if [[ -f "${PWD}/vendor_boot.img" ]]; then
 
         # Decrompress 'vendor_boot.img-vendor_ramdisk'
         unlz4 "${OUTPUT}/vendor_boot.img-vendor_ramdisk" "${OUTPUT}/ramdisk.lz4"
-        7z x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
+        7zz x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
 
         ## Clean-up
         rm -rf "${OUTPUT}/ramdisk.lz4"
@@ -385,7 +385,7 @@ if [[ -f "${PWD}/vendor_kernel_boot.img" ]]; then
 
         # Decrompress 'vendor_kernel_boot.img-vendor_ramdisk'
         unlz4 "${OUTPUT}/vendor_kernel_boot.img-vendor_ramdisk" "${OUTPUT}/ramdisk.lz4"
-        7z x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
+        7zz x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
 
         ## Clean-up
         rm -rf "${OUTPUT}/ramdisk.lz4"
@@ -414,7 +414,7 @@ if [[ -f "${PWD}/init_boot.img" ]]; then
 
         # Decrompress 'init_boot.img-ramdisk'
         unlz4 "${OUTPUT}/init_boot.img-ramdisk" "${OUTPUT}/ramdisk.lz4"
-        7z x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
+        7zz x "${OUTPUT}/ramdisk.lz4" -o"${OUTPUT}/ramdisk"
 
         ## Clean-up
         rm -rf "${OUTPUT}/ramdisk.lz4"
@@ -450,7 +450,7 @@ for dir in "vendor/euclid" "system/system/euclid" "reserve/reserve"; do
         for f in *.img; do
             [[ -f $f ]] || continue
             sendTG_edit_wrapper temporary "${MESSAGE_ID}" "${MESSAGE}"$'\n'"<code>Partition Name: ${p}</code>" > /dev/null
-            7z x "$f" -o"${f/.img/}"
+            7zz x "$f" -o"${f/.img/}"
             rm -fv "$f"
         done
         popd || terminate 1