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

Commit bbf0aa2

Browse files
v8.11
Bug Fix: The infamous cat write error. Bug Fix: Gzip compression not working on some devices. Bug Fix: Unknown operand error with some busybox versions.
1 parent 73cb5bd commit bbf0aa2

File tree

3 files changed

+25
-22
lines changed

3 files changed

+25
-22
lines changed

changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,3 +196,6 @@ v8.10 - Added: /data/data partition backup (partition letter "j").
196196
Bug Fix: TWRP default backup name to use hyphen instead of dot.
197197
Bug Fix: Minor bug in excludes detection.
198198
Bug Fix: Premature end of backup process.
199+
v8.11 - Bug Fix: The infamous cat write error.
200+
Bug Fix: Gzip compression not working on some devices.
201+
Bug Fix: Unknown operand error with some busybox versions.

onandroid

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
######################################################################
3535

3636
#### Define constants
37-
version="8.10"
37+
version="8.11"
3838
blobsdir="/clockworkmod/blobs"
3939
tz="utc"
4040
req_power=10
@@ -313,7 +313,7 @@ nandroid_dd(){
313313
fi
314314
if $bb [ "$part_start" == "" ]; then
315315
$bb dd if=$part_path/$part_dev of=$path/$name/$part_fname.$img_ext bs=$part_bs 2> /dev/null &
316-
while $bb [ `$bb ps w | $bb grep "$bb dd" | $bb grep -v "$bb grep $bb dd" | $bb awk '{print $1}'` ]; do
316+
while $bb [ `$bb ps w | $bb grep "$bb dd" | $bb grep -v "$bb grep $bb dd" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
317317
progress $part_fname.$img_ext
318318
$bb sleep 2
319319
done
@@ -323,7 +323,7 @@ nandroid_dd(){
323323
part_start=`$bb expr $part_start / $part_bs`
324324
part_count=`$bb expr $part_count / $part_bs`
325325
$bb dd if=$part_path/$part_dev of=$path/$name/$part_fname.$img_ext bs=$part_bs skip=$part_start count=$part_count 2> /dev/null &
326-
while $bb [ `$bb ps w | $bb grep "$bb dd" | $bb grep -v "$bb grep $bb dd" | $bb awk '{print $1}'` ]; do
326+
while $bb [ `$bb ps w | $bb grep "$bb dd" | $bb grep -v "$bb grep $bb dd" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
327327
progress $part_fname.$img_ext
328328
$bb sleep 2
329329
done
@@ -365,24 +365,24 @@ nandroid_fs(){
365365
if $bb [ "$compress_backup" == "yes" ]; then
366366
$bb tar -czf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
367367
$bb sleep 2
368-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
368+
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
369369
progress $part_fname.$part_fs.win
370370
$bb sleep 2
371371
done
372372
if $bb [ ! -f $path/$name/$part_fname.$part_fs.win ]; then
373373
$bb tar -cZf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
374374
$bb sleep 2
375-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
375+
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
376376
progress $part_fname.$part_fs.win
377377
$bb sleep 2
378378
done
379379
fi
380380
progress_done
381381
$bb echo ""
382382
elif $bb [ "$compress_backup" == "gzip" ]; then
383-
$bb tar -c $part_excludes ./* | $bb gzip -c > $path/$name/$part_fname.$part_fs.win > /dev/null 2>&1 &
383+
$bb tar -c $part_excludes ./* | $bb gzip -c > $path/$name/$part_fname.$part_fs.win 2> /dev/null &
384384
$bb sleep 2
385-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
385+
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
386386
progress $part_fname.$part_fs.win
387387
$bb sleep 2
388388
done
@@ -391,7 +391,7 @@ nandroid_fs(){
391391
else
392392
$bb tar -cf $path/$name/$part_fname.$part_fs.win $part_excludes ./* > /dev/null 2>&1 &
393393
$bb sleep 2
394-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
394+
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
395395
progress $part_fname.$part_fs.win
396396
$bb sleep 2
397397
done
@@ -436,7 +436,7 @@ nandroid_fs(){
436436
$bb touch $path/$name/$part_fname.$part_fs.tar
437437
$bb tar -c $part_excludes $part_mountdir 2> /dev/null | $bb split -a 1 -b 1000000000 /proc/self/fd/0 $path/$name/$part_fname.$part_fs.tar. > /dev/null 2>&1 &
438438
$bb sleep 2
439-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
439+
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
440440
progress $part_fname.$part_fs.tar
441441
$bb sleep 2
442442
done
@@ -450,7 +450,7 @@ nandroid_fs(){
450450
fi
451451
$bb tar -cf $path/$name/$part_fname.$part_fs.tar $part_excludes $part_mountdir > /dev/null 2>&1 &
452452
$bb sleep 2
453-
while $bb [ `$bb ps w | $bb grep "$bb tar" | $bb grep -v "$bb grep $bb tar" | $bb awk '{print $1}'` ]; do
453+
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
454454
progress $part_fname.$part_fs.tar
455455
$bb sleep 2
456456
done
@@ -652,14 +652,14 @@ logerror "###########################" ""
652652

653653
#### Spit details about the recovery installed
654654
if $bb [ -f /cache/recovery/last_log ]; then
655-
if $bb [ "`$bb cat /cache/recovery/last_log | $bb grep -i "cwm-based recovery" 2> /dev/nul`" != "" ]; then
656-
logerror "Recovery:" "`$bb cat /cache/recovery/last_log | $bb grep -i "cwm-based recovery" 2> /dev/nul`"
657-
elif $bb [ "`$bb cat /cache/recovery/last_log | $bb grep -i "clockworkmod recovery" 2> /dev/nul`" != "" ]; then
658-
logerror "Recovery:" "`$bb cat /cache/recovery/last_log | $bb grep -i "clockworkmod recovery" 2> /dev/nul`"
659-
elif $bb [ "`$bb cat /cache/recovery/last_log | $bb head -n 1 | $bb awk '{print $2}' 2> /dev/nul`" == "TWRP" ]; then
660-
logerror "Recovery:" "`$bb cat /cache/recovery/last_log | $bb head -n 1 | $bb awk '{print $2}' 2> /dev/nul` `$bb cat /cache/recovery/last_log | $bb head -n 1 | $bb awk '{print $3}' 2> /dev/nul`"
661-
elif $bb [ "`$bb cat /cache/recovery/last_log | $bb grep -i "philz touch" 2> /dev/nul`" != "" ]; then
662-
logerror "Recovery:" "`$bb cat /cache/recovery/last_log | $bb grep -i "philz touch" 2> /dev/nul`"
655+
if $bb [ "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "cwm-based recovery" 2> /dev/nul`" != "" ]; then
656+
logerror "Recovery:" "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "cwm-based recovery" 2> /dev/nul`"
657+
elif $bb [ "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "clockworkmod recovery" 2> /dev/nul`" != "" ]; then
658+
logerror "Recovery:" "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "clockworkmod recovery" 2> /dev/nul`"
659+
elif $bb [ "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb head -n 1 | $bb awk '{print $2}' 2> /dev/nul`" == "TWRP" ]; then
660+
logerror "Recovery:" "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb head -n 1 | $bb awk '{print $2}' 2> /dev/nul` `$bb cat /cache/recovery/last_log | $bb head -n 1 | $bb awk '{print $3}' 2> /dev/nul`"
661+
elif $bb [ "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "philz touch" 2> /dev/nul`" != "" ]; then
662+
logerror "Recovery:" "`$bb cat /cache/recovery/last_log 2> /dev/null | $bb grep -i "philz touch" 2> /dev/nul`"
663663
else
664664
logerror "Recovery:" "Generic recovery."
665665
fi
@@ -1433,7 +1433,7 @@ set_excludes "sdext" "$extm" "$sdext_fs" "x"
14331433
logmsg "Backing up to $path/$name"
14341434

14351435
#### Change to backup directory
1436-
cd -- $path/$name
1436+
cd $path/$name
14371437

14381438
#### Backup mmcblk0_start (for Acer devices)
14391439
if $bb [ "$flexrom_fs" ]; then
@@ -1538,7 +1538,7 @@ if $bb [ "$backup_style" == "twrp" -a "$generate_md5" != "no" ]; then
15381538
for file in $files; do
15391539
logmsg "Generating md5sum for $file...\c"
15401540
$bb md5sum $file > $file.md5 2> /dev/null &
1541-
while $bb [ ` $bb ps w | $bb grep "$bb md5sum" | $bb grep -v "$bb grep $bb md5sum" | $bb awk '{print $1}'` ]; do
1541+
while $bb [ `$bb ps w | $bb grep "$bb md5sum" | $bb grep -v "$bb grep $bb md5sum" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
15421542
progress md5sum_generate
15431543
$bb sleep 2
15441544
done
@@ -1558,7 +1558,7 @@ else
15581558
$bb rm nandroid.md5
15591559
fi
15601560
$bb md5sum .* * > nandroid.md5 2> /dev/null &
1561-
while $bb [ `$bb ps w | $bb grep "$bb md5sum" | $bb grep -v "$bb grep $bb md5sum" | $bb awk '{print $1}'` ]; do
1561+
while $bb [ `$bb ps w | $bb grep "$bb md5sum" | $bb grep -v "$bb grep $bb md5sum" | $bb tail -n 1 | $bb awk '{print $1}'` ]; do
15621562
progress md5sum_generate
15631563
$bb sleep 2
15641564
done

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.10
1+
8.11

0 commit comments

Comments
 (0)