2011-09-05 14:26:36 +00:00
|
|
|
--- dd_rhelp.orig 2011-05-14 20:17:10.782000079 +0300
|
|
|
|
+++ dd_rhelp 2011-05-14 20:18:26.578000081 +0300
|
|
|
|
@@ -906,7 +906,7 @@
|
2010-11-05 16:21:02 +00:00
|
|
|
|
|
|
|
string="^Summary for $infile -> $outfile:"
|
|
|
|
infoline="^dd_rescue: (info):"
|
|
|
|
-eofstring="$infoline $infile ([0-9]\+\.[0-9]k): EOF\$"
|
|
|
|
+eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
|
|
|
|
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
|
|
|
|
|
|
|
#
|
2011-09-05 14:26:36 +00:00
|
|
|
@@ -990,7 +990,7 @@
|
2010-11-05 16:21:02 +00:00
|
|
|
function get_eof()
|
|
|
|
{
|
|
|
|
|
2011-09-05 14:26:36 +00:00
|
|
|
- eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')"
|
|
|
|
+ eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF.*$/\1/g')"
|
2010-11-05 16:21:02 +00:00
|
|
|
|
|
|
|
eof="nothing"
|
|
|
|
|