|
98 | 98 | [ -f "$saved" ] && rm -fr "$saved" |
99 | 99 |
|
100 | 100 | if [ "$CONVER" != "raw" ];then |
101 | | -saved="$TMP/${saved##*/}" |
102 | 101 | out_saved="$saved" |
| 102 | +saved="$TMP/${saved##*/}" |
103 | 103 | fi |
104 | 104 |
|
105 | 105 | # Chọn định dạng tệp phân vùng |
@@ -154,7 +154,7 @@ PIDK=$! |
154 | 154 | num1="$1"; num2="$2"; |
155 | 155 | while kill -0 $PIDK 2>/dev/null; do |
156 | 156 | if [ -f "$num2" ];then |
157 | | - num3=$(wc -c <"$num2") |
| 157 | + num3=$(stat -c %s "$num2") |
158 | 158 | if [ "${num3:-0}" != 0 ];then |
159 | 159 | [ "${num3:-0}" == "${num4:-1}" ] || progress "$((num3 * 100 / num1))/100" |
160 | 160 | num4="$num3" |
@@ -341,18 +341,16 @@ elif [ "$partition" == "ext" ];then |
341 | 341 | fi |
342 | 342 | fi |
343 | 343 |
|
344 | | -if [[ -f $OUTPUT/dynamic_partitions_op_list ]] && [[ "$partition" =~ ^(ext|f2fs|erofs)$ ]];then |
345 | | - if [ ! -f $OUTPUT/out/dynamic_partitions_op_list ];then |
346 | | - cp -f $OUTPUT/dynamic_partitions_op_list $OUTPUT/out/dynamic_partitions_op_list |
347 | | - fi |
| 344 | +if [[ -f $PTSD/dynamic_partitions_op_list ]] && [[ "$partition" =~ ^(ext|f2fs|erofs)$ ]];then |
| 345 | + cp -f $PTSD/dynamic_partitions_op_list $OUTPUT/out/dynamic_partitions_op_list |
348 | 346 | if [ -f "$saved" ];then |
349 | | - img_size=$(wc -c <"$saved") |
| 347 | + img_size=$(stat -c %s "$saved") |
350 | 348 | sed -i "s/resize ${INPUT##*/} [^*]*/resize ${INPUT##*/} $img_size/" $OUTPUT/out/dynamic_partitions_op_list |
351 | 349 | fi |
352 | 350 | fi |
353 | 351 |
|
354 | 352 | if [[ "$partition" =~ ^(erofs|f2fs|ext)$ ]];then |
355 | | - text_sizes=$(wc -c <"$saved") |
| 353 | + [ "$img_size" ] && text_sizes="$img_size" || text_sizes=$(stat -c %s "$saved") |
356 | 354 | echo "$sizes_text: ${saved##*/} $(coverbyte $text_sizes) ($text_sizes)" |
357 | 355 | echo |
358 | 356 | if [ "$CONVER" != "raw" ];then |
@@ -387,7 +385,7 @@ if [[ "$partition" =~ ^(erofs|f2fs|ext)$ ]];then |
387 | 385 | elif [ "$CONVER" == 'sparse' ];then |
388 | 386 | img2simg "$saved" "$out_saved" >/dev/null |
389 | 387 | fi |
390 | | - [ "$CONVER" != "raw" ] && rm -f "$saved" |
| 388 | + [ "$CONVER" == "raw" ] && mv "$saved" "$out_saved" || rm -f "$saved" |
391 | 389 | fi |
392 | 390 |
|
393 | 391 | if [ "$CDELIMG" == 1 ];then |
|
0 commit comments