dd_rescue/dd_rhelp_EOF.diff

27 lines
969 B
Diff
Raw Normal View History

Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
===================================================================
--- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
@@ -191,9 +191,9 @@ fi
# regexp for parsing the log file.
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...
#
# === Functions
@@ -314,9 +314,9 @@ function bc_calc ()
# or 'nb' where nb is best EOF found
function get_eof()
{
- 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')"
eof="nothing"
for i in $eoflines