7619eeb31a
* Handle directory as output filename (append input basename). - Fix dd_rhelp.test script and add to %check. OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=5
23 lines
847 B
Diff
23 lines
847 B
Diff
Index: dd_rhelp-0.1.2/dd_rhelp
|
|
===================================================================
|
|
--- dd_rhelp-0.1.2.orig/dd_rhelp
|
|
+++ dd_rhelp-0.1.2/dd_rhelp
|
|
@@ -906,7 +906,7 @@ fi
|
|
|
|
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...
|
|
|
|
#
|
|
@@ -991,7 +991,7 @@ function get_valid_dd_rescue() {
|
|
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"
|
|
|