Skip to content
This repository was archived by the owner on Jul 21, 2019. It is now read-only.

Commit 6bf35aa

Browse files
ameer1234567890ameer1234567890
committed
v9.52
Bug Fix: TWRP backups taking too long for file list.
1 parent 2851657 commit 6bf35aa

File tree

3 files changed

+29
-137
lines changed

3 files changed

+29
-137
lines changed

‎changelog‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,3 +244,4 @@ v9.50 - Added: LED notification for Samsung Galaxy Relay 4G.
244244
v9.51 - Added: Preservation of SELinux contexts.
245245
Bug Fix: Data partition size calculated incorrectly when excluding Google Music cache.
246246
Bug Fix: TWRP backups taking too long for file list.
247+
v9.52 - Bug Fix: TWRP backups taking too long for file list.

‎onandroid‎

Lines changed: 27 additions & 136 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
###########################################################################################################
3030

3131
#### Define constants
32-
version="9.51"
32+
version="9.52"
3333
blobsdir="/clockworkmod/blobs"
3434
tz="utc"
3535
req_power=10
@@ -507,150 +507,41 @@ nandroid_fs(){
507507
else
508508
full_size=-1
509509
fi
510-
maxfilesize=2047
511-
splitfilesize=1024
512-
if $bb [ $full_size -gt $maxfilesize ]; then
513-
$bb touch $path/$name/.list_generating
514-
while $bb [ -f $path/$name/.list_generating ]; do
515-
progress none
510+
if $bb [ "$compress_backup" == "yes" ]; then
511+
$bb tar -cpzf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
512+
$bb sleep 2
513+
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
514+
progress $part_fname.$part_fs.win
516515
$bb sleep 2
517-
done &
518-
$bb touch $path/$name/$part_fname.$part_fs.win
519-
i=0
520-
$bb mkdir -p $path/$name/tmp
521-
$bb rm $path/$name/tmp/list$i 2> /dev/nul
522-
exclude_dirs=`$bb echo $part_excludes | sed s/'--exclude='/''/g | sed s/'\/\*'/''/g`
523-
for dir in $exclude_dirs; do
524-
if $bb [ -d $dir ]; then
525-
$bb echo $dir >> $path/$name/tmp/list$i
526-
fi
527-
done
528-
dirlist="`$bb find . -type d -xdev`"
529-
for dir in $dirlist; do
530-
if $bb [ -d $dir ]; then
531-
if $bb [ "`$bb ls -A $dir`" == "" ]; then
532-
$bb echo $dir >> $path/$name/tmp/list$i
533-
fi
534-
fi
535-
done
536-
filelist="`$bb find . -type b` `$bb find . -type c` `$bb find . -type p` `$bb find . -type f` `$bb find . -type l` `$bb find . -type s`"
537-
listsize=0
538-
for file in $filelist; do
539-
if $bb [ -e $file ]; then
540-
for dir in $exclude_dirs; do
541-
dir_length=`$bb expr length $dir`
542-
if $bb [ "`$bb expr substr $file 1 $dir_length`" == "$dir" ]; then
543-
continue 2
544-
fi
545-
done
546-
filesize=`$bb du -sm $file | $bb awk '{print $1}'`
547-
if $bb [ `$bb expr $listsize + $filesize` -lt $splitfilesize ]; then
548-
listsize=`$bb expr $listsize + $filesize`
549-
$bb echo $file >> $path/$name/tmp/list$i
550-
else
551-
listsize=0
552-
i=`$bb expr $i + 1`
553-
$bb rm $path/$name/tmp/list$i 2> /dev/nul
554-
listsize=`$bb expr $listsize + $filesize`
555-
$bb echo $file >> $path/$name/tmp/list$i
556-
if $bb [ $listsize -gt $maxfilesize ]; then
557-
loglater="$LANG_ERROR: $LANG_FSOVER2GB"
558-
fi
559-
fi
560-
fi
561-
done
562-
listlist=`ls $path/$name/tmp`
563-
i=0
564-
$bb rm $path/$name/.list_generating
565-
for list in $listlist; do
566-
suffix=$i
567-
while $bb [ `$bb echo $suffix | $bb wc -m` -lt 4 ]; do
568-
suffix="0$suffix"
569-
done
570-
if $bb [ "$compress_backup" == "yes" ]; then
571-
$bb tar -cpzf $path/$name/$part_fname.$part_fs.win$suffix -T $path/$name/tmp/$list $part_excludes > /dev/null 2>&1 &
572-
$bb sleep 2
573-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
574-
progress $part_fname.$part_fs.win
575-
$bb sleep 2
576-
done
577-
if $bb [ ! -f $path/$name/$part_fname.$part_fs.win$suffix ]; then
578-
$bb tar -cpZf $path/$name/$part_fname.$part_fs.win$suffix -T $path/$name/tmp/$list $part_excludes > /dev/null 2>&1 &
579-
$bb sleep 2
580-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
581-
progress $part_fname.$part_fs.win
582-
$bb sleep 2
583-
done
584-
fi
585-
elif $bb [ "$compress_backup" == "gzip" ]; then
586-
$bb echo "\n$bb tar -cp $part_excludes -T $path/$name/tmp/$list | $bb gzip -c > $path/$name/$part_fname.$part_fs.win$suffix > /dev/null 2>&1 &"
587-
$bb tar -cp $part_excludes -T $path/$name/tmp/$list | $bb gzip -c > $path/$name/$part_fname.$part_fs.win$suffix 2> /dev/null &
588-
$bb sleep 2
589-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
590-
progress $part_fname.$part_fs.win
591-
$bb sleep 2
592-
done
593-
else
594-
$bb tar -cpf $path/$name/$part_fname.$part_fs.win$suffix -T $path/$name/tmp/$list $part_excludes > /dev/null 2>&1 &
595-
$bb sleep 2
596-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
597-
progress $part_fname.$part_fs.win
598-
$bb sleep 2
599-
done
600-
fi
601-
i=`$bb expr $i + 1`
602516
done
603-
$bb rm -rf $path/$name/tmp
604-
progress_done
605-
$bb echo ""
606-
if $bb [ "$loglater" != "" ]; then
607-
logmsg $loglater
608-
fi
609-
$bb rm $path/$name/$part_fname.$part_fs.win 2> /dev/nul
610-
if $bb [ $? != 0 -a -f $path/$name/$part_fname.$part_fs.win ]; then
611-
$bb sleep 2
612-
$bb rm $path/$name/$part_fname.$part_fs.win 2> /dev/nul
613-
if $bb [ $? != 0 -a -f $path/$name/$part_fname.$part_fs.win ]; then
614-
logmsg "$LANG_ERROR: $LANG_MAYXRESTORE"
615-
fi
616-
fi
617-
else
618-
if $bb [ "$compress_backup" == "yes" ]; then
619-
$bb tar -cpzf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
517+
if $bb [ ! -f $path/$name/$part_fname.$part_fs.win ]; then
518+
$bb tar -cpZf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
620519
$bb sleep 2
621520
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
622521
progress $part_fname.$part_fs.win
623522
$bb sleep 2
624523
done
625-
if $bb [ ! -f $path/$name/$part_fname.$part_fs.win ]; then
626-
$bb tar -cpZf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
627-
$bb sleep 2
628-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
629-
progress $part_fname.$part_fs.win
630-
$bb sleep 2
631-
done
632-
fi
633-
progress_done
634-
$bb echo ""
635-
elif $bb [ "$compress_backup" == "gzip" ]; then
636-
$bb tar -cp $part_excludes ./* | $bb gzip -c > $path/$name/$part_fname.$part_fs.win 2> /dev/null &
524+
fi
525+
progress_done
526+
$bb echo ""
527+
elif $bb [ "$compress_backup" == "gzip" ]; then
528+
$bb tar -cp $part_excludes ./* | $bb gzip -c > $path/$name/$part_fname.$part_fs.win 2> /dev/null &
529+
$bb sleep 2
530+
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
531+
progress $part_fname.$part_fs.win
637532
$bb sleep 2
638-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
639-
progress $part_fname.$part_fs.win
640-
$bb sleep 2
641-
done
642-
progress_done
643-
$bb echo ""
644-
else
645-
$bb tar -cpf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
533+
done
534+
progress_done
535+
$bb echo ""
536+
else
537+
$bb tar -cpf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
538+
$bb sleep 2
539+
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
540+
progress $part_fname.$part_fs.win
646541
$bb sleep 2
647-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
648-
progress $part_fname.$part_fs.win
649-
$bb sleep 2
650-
done
651-
progress_done
652-
$bb echo ""
653-
fi
542+
done
543+
progress_done
544+
$bb echo ""
654545
fi
655546
else
656547
if $bb [ "$part_fs" == "yaffs2" -a "$yaffs_override" != "yes" ]; then

‎version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9.51
1+
9.52

0 commit comments

Comments
 (0)