diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script index e3dcbf0..23e6250 100644 --- a/META-INF/com/google/android/updater-script +++ b/META-INF/com/google/android/updater-script @@ -3,4 +3,4 @@ # Dummy file; update-binary is a shell script (DO NOT CHANGE) # # -# AK_BASE_VERSION=20230920 +# AK_BASE_VERSION=20231009 diff --git a/tools/ak3-core.sh b/tools/ak3-core.sh index 8511cb8..76c0b76 100755 --- a/tools/ak3-core.sh +++ b/tools/ak3-core.sh @@ -66,7 +66,7 @@ set_perm_recursive() { ### dump_boot functions: # split_boot (dump and split image only) split_boot() { - local dumpfail; + local splitfail; if [ ! -e "$(echo $block | cut -d\ -f1)" ]; then abort "Invalid partition. Aborting..."; @@ -82,7 +82,9 @@ split_boot() { else dd if=$block of=$bootimg $customdd; fi; - [ $? != 0 ] && dumpfail=1; + if [ $? != 0 ]; then + abort "Dumping image failed. Aborting..."; + fi; mkdir -p $split_img; cd $split_img; @@ -92,7 +94,7 @@ split_boot() { $bin/elftool unpack -i $bootimg -o elftool_out; fi; $bin/unpackelf -i $bootimg; - [ $? != 0 ] && dumpfail=1; + [ $? != 0 ] && splitfail=1; mv -f boot.img-kernel kernel.gz; mv -f boot.img-ramdisk ramdisk.cpio.gz; mv -f boot.img-cmdline cmdline.txt 2>/dev/null; @@ -119,7 +121,7 @@ split_boot() { grep "Address:" header | cut -c15- > boot.img-addr; grep "Point:" header | cut -c15- > boot.img-ep; $bin/dumpimage -p 0 -o kernel.gz boot-trimmed.img; - [ $? != 0 ] && dumpfail=1; + [ $? != 0 ] && splitfail=1; case $(cat boot.img-type) in Multi) $bin/dumpimage -p 1 -o ramdisk.cpio.gz boot-trimmed.img;; RAMDisk) mv -f kernel.gz ramdisk.cpio.gz;; @@ -129,13 +131,13 @@ split_boot() { else (set -o pipefail; $bin/magiskboot unpack -h $bootimg 2>&1 | tee infotmp >&2); case $? in - 1) dumpfail=1;; + 1) splitfail=1;; 2) touch chromeos;; esac; fi; - if [ $? != 0 -o "$dumpfail" ]; then - abort "Dumping/splitting image failed. Aborting..."; + if [ $? != 0 -o "$splitfail" ]; then + abort "Splitting image failed. Aborting..."; fi; cd $home; }