@@ -77,7 +77,7 @@ if [ "$dang_tep" == 'zstd' ];then
7777 zstd -T$threads -f -d -k " $INPUT " " $file_img " & > /dev/null
7878elif [ " $dang_tep " == ' br' || [ " $dang_tep " == ' dat' ; then
7979 tenpjanvung=" $( echo " ${INPUT##*/ } " | cut -d. -f1) "
80- [ -e " ${INPUT%/* } /$tenpjanvung .transfer.list" || abort " $more_text_5 $tenpjanvung .transfer.list"
80+ [ -e " ${INPUT%/* } /$tenpjanvung .transfer.list" || killtree " $more_text_5 $tenpjanvung .transfer.list"
8181 echo -e " $unpack_text_0 (${INPUT##*/ } ) ➠ (raw)...\n"
8282 [ " ${INPUT##* .} " == ' br' && brotli -f -d " $INPUT " " $TMP /$( echo " ${INPUT% .* } " | awk -F/ ' {print $NF}' ) " & > /dev/null
8383 file_img=" $TMP /$( echo " ${INPUT##*/ } " | cut -d. -f1) "
@@ -88,7 +88,7 @@ elif [ "$dang_tep" == 'sparse' ];then
8888 simg2img " $INPUT " " $file_img "
8989elif [ " $dang_tep " == ' payload' || [ -n " $xacnhatpay " ; then
9090 echo -e " $unpack_text_1 (${INPUT##*/ } ) ➠ ($PVUGBIN )...\n"
91- payload_dumper --no-parallel --out " $TMP " " $PVUGBIN " " $INPUT " > /dev/null || abort " Payload unpack error"
91+ payload_dumper --no-parallel --out " $TMP " " $PVUGBIN " " $INPUT " > /dev/null || killtree " Payload unpack error"
9292 file_img=" $TMP /$PVUGBIN .img"
9393elif [ " $dang_tep " == ' super' ; then
9494 echo -e " $unpack_text_1 (${INPUT##*/ } ) ➠ ($PVUGBIN )...\n"
@@ -136,7 +136,7 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
136136 echo " $dang_file " > " $OUTPUT /config/${namepv##*/ } _info"
137137 elif [ " $dang_file " == ' f2fs' ; then
138138 if [ " $ROT " == 0 ]; then
139- abort " Error Unpack: f2fs, $root_warning_text "
139+ killtree " Error Unpack: f2fs, $root_warning_text "
140140 fi
141141 # dump.f2fs -r -P -L -f -o "$OUTPUT/${namepv##*/}" "$file_img"
142142 mkdir -p " $TMP /${namepv##*/ } "
@@ -149,12 +149,12 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
149149 echo " $dang_file " > " $OUTPUT /config/${namepv##*/ } _info"
150150 echo " $( fsck.f2fs " $file_img " | grep ' superblock features' | grep -cm1 ro) " > " $OUTPUT /config/${namepv##*/ } _f2fs_ro"
151151 elif [ " $dang_file " == ' erofs' ; then
152- extract.erofs -T$threads -x -i " $file_img " " $OUTPUT " > $TMP /extract_erofs.log || abort " \nextract.erofs error: ${namepv##*/ } " " $OUTPUT /${namepv##*/ } "
152+ extract.erofs -T$threads -x -i " $file_img " " $OUTPUT " > $TMP /extract_erofs.log || killtree " \nextract.erofs error: ${namepv##*/ } " " $OUTPUT /${namepv##*/ } "
153153 echo " $dang_file " > " $OUTPUT /config/${namepv##*/ } _info"
154154 if [ -f $OUTPUT /config/exception.log ]; then
155155 rm -fr " $OUTPUT /${namepv##*/ } "
156156 cat $OUTPUT /config/exception.log >&2
157- abort " \nIncomplete file error please check hash" $OUTPUT /config/exception.log
157+ killtree " \nIncomplete file error please check hash" $OUTPUT /config/exception.log
158158 fi
159159 elif [ " $dang_file " == ' logo' ; then
160160 logo_dumper.py --out " $OUTPUT /${namepv##*/ } " " $file_img "
@@ -170,7 +170,7 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
170170 magiskboot unpack -h " $file_img " 2>&1
171171 if [ " $? " = ' 1' ; then
172172 rm -rf " $OUTPUT /${namepv##*/ } "
173- abort " $unpack_text_3 "
173+ killtree " $unpack_text_3 "
174174 else
175175 # unpack dtb, dtbo
176176 for unp in $( ls -1d * 2> /dev/null | sort -n -t . -k 2) ; do
@@ -188,7 +188,7 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
188188 for unsl in $( ls -1 * .[0-9]* 2> /dev/null | sort -n -t . -k 2) ; do
189189 echo " Decode: $unsl > dts_$unsl "
190190 dtc -q -@ -I dtb -O dts -o dts_$unsl $unsl
191- [ " $? " != 0 ] && abort " $unpack_text_5 $unsl "
191+ [ " $? " != 0 ] && killtree " $unpack_text_5 $unsl "
192192 mv $unsl cache/$unsl
193193 sha256sum -b dts_$unsl > cache/md5_$unsl
194194 done
@@ -199,7 +199,7 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
199199 cd " ${vch% .* } "
200200 EXTRACT_UNSAFE_SYMLINKS=1 cpio -d -F " $OUTPUT /${namepv##*/ } /$vch " 2>&1
201201 if [ " $? " != 0 -o ! " $( ls) " ; then
202- abort " $unpack_text_4 "
202+ killtree " $unpack_text_4 "
203203 else
204204 rm -f " $OUTPUT /${namepv##*/ } /$vch "
205205 fi
@@ -216,7 +216,7 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
216216 for dtbo in $( ls -t dtb.* | sort -n -t . -k 2) ; do
217217 echo " Decode: $dtbo "
218218 dtc -q -@ -I dtb -O dts -o dts.${dtbo##* .} $dtbo
219- [ " $? " != 0 ] && abort " $unpack_text_5 $dtbo "
219+ [ " $? " != 0 ] && killtree " $unpack_text_5 $dtbo "
220220 mv $dtbo cache/$dtbo
221221 sha256sum -b dts.${dtbo##* .} > cache/md5_dts.${dtbo##* .}
222222 done
@@ -225,13 +225,17 @@ mkdir -p "$OUTPUT/${namepv##*/}" $OUTPUT/config
225225 rm -fr " $OUTPUT /${namepv##*/ } "
226226 echo -e " $unpack_text_8 ${file_img##*/ } ($dang_file )\n" >&2
227227 fi
228+ [ -d " $OUTPUT /${namepv##*/ } " && echo -e " $save_text $OUTPUT /${namepv##*/ } \n"
228229else
229230 if [ " $dang_file " == " super" ; then
230231 echo -e " $unpack_text_7 \n"
231232 [ " $dang_tep " == ' amlogic' && echo -e " $save_text ${INPUT%/* } /${ten_paion} _amlogic\n" || echo -e " $save_text $INPUT \n"
232233 fi
233- echo -e " $unpack_text_6 ${file_img##*/ } ($dang_file )\n"
234- [ " $NODECO " == 1 ] && mv " $file_img " " $PTSD /out/${file_img##*/ } "
234+ echo -e " $unpack_text_6 ${file_img##*/ } ($dang_file )\n"
235+ if [ " $NODECO " == 1 ]; then
236+ echo -e " $save_text $PTSD /out\n"
237+ mv " $file_img " " $PTSD /out/${file_img##*/ } "
238+ fi
235239fi
236240
237241if [ " $XOAOAT " == 1 ]; then
0 commit comments