a85a6326b1
Accepted submit request 52034 from user coolo OBS-URL: https://build.opensuse.org/request/show/52034 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dd_rescue?expand=0&rev=1
158 lines
5.7 KiB
Diff
158 lines
5.7 KiB
Diff
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
|
|
@@ -225,9 +225,9 @@ function get_valid_dd_rescue
|
|
else
|
|
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
|
|
fi
|
|
|
|
- path="$(dirname $(type -ap "$0" | "${TAIL}" -1))/dd_rescue"
|
|
+ path="$(dirname $(type -ap "$0" | "${TAIL}" -n 1))/dd_rescue"
|
|
|
|
if [ -x "$path" ] ;then
|
|
version=$("$path" -V 2>&1 | grep "dd_rescue Version" | cut -f 3 -d " " |
|
|
cut -f 1 -d ",")
|
|
@@ -356,9 +356,9 @@ function add_chunk()
|
|
while test "$parsechunk"
|
|
do
|
|
|
|
# get first chunk already marked.
|
|
- i="$(echo "$parsechunk" | "${HEAD}" -1 )"
|
|
+ i="$(echo "$parsechunk" | "${HEAD}" -n 1 )"
|
|
|
|
# pull the two bounds
|
|
i_start="$(echo "$i" | "${CUT}" -f 1 -d "-")"
|
|
i_stop="$(echo "$i" | "${CUT}" -f 2 -d "-")"
|
|
@@ -371,9 +371,9 @@ function add_chunk()
|
|
then
|
|
# new chunk doesn't overlap with current chunk
|
|
# Iterate, put current chunk in $goodchunk.
|
|
goodchunk="$(echo -en "$goodchunk\n$i")"
|
|
- parsechunk="$(echo "$parsechunk" | "${TAIL}" +2)"
|
|
+ parsechunk="$(echo "$parsechunk" | "${TAIL}" -n +2)"
|
|
continue
|
|
fi
|
|
|
|
# new chunk ends before current chunk start ?
|
|
@@ -407,18 +407,18 @@ function add_chunk()
|
|
# new chunk contains entirely current chunk
|
|
if [ "$as_int" == "0" ] && [ "$ae_int" == "0" ]
|
|
then
|
|
# we forget about current chunk, and iterate.
|
|
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
|
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
|
continue
|
|
fi
|
|
|
|
# new chunk overlap on its end with beginning of current chunk
|
|
if [ "$as_int" == "0" ] && [ "$ae_int" == "1" ]
|
|
then
|
|
# grow new chunk to englobe current chunk.
|
|
arg_stop=$i_stop
|
|
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
|
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
|
|
|
break; # we can break because chunk are sorted.
|
|
fi
|
|
|
|
@@ -426,9 +426,9 @@ function add_chunk()
|
|
if [ "$as_int" == "1" ] && [ "$ae_int" == "0" ]
|
|
then
|
|
# grow new chunk to englobe current chunk.
|
|
arg_start=$i_start
|
|
- parsechunk=$(echo "$parsechunk" | "${TAIL}" +2)
|
|
+ parsechunk=$(echo "$parsechunk" | "${TAIL}" -n +2)
|
|
continue; # new chunk might overlap more chunks
|
|
fi
|
|
|
|
done
|
|
@@ -455,9 +455,9 @@ function get_next_pos()
|
|
|
|
# finding last's chunk end.
|
|
|
|
if test "$chunk" ;then
|
|
- last_chunk=$(echo "$chunk" | "${TAIL}" -1 )
|
|
+ last_chunk=$(echo "$chunk" | "${TAIL}" -n 1 )
|
|
max_stop=$(echo "$last_chunk" | "${CUT}" -f 2 -d "-")
|
|
else
|
|
max_stop=0
|
|
fi
|
|
@@ -504,9 +504,9 @@ function get_next_pos()
|
|
# changes $logcontent, $chunk, $eof
|
|
function swallow_last_summary()
|
|
{
|
|
# last summary of log (4 lines output by printreport())
|
|
- last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -4)
|
|
+ last_logcontent=$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$string" -A 3 | "${TAIL}" -n 4)
|
|
process_log "$last_logcontent"
|
|
|
|
get_eof
|
|
|
|
@@ -518,9 +518,9 @@ function swallow_last_summary()
|
|
|
|
function get_last_chunk()
|
|
{
|
|
if test "$chunk"; then
|
|
- last_chunk="$(echo "$chunk" | "${TAIL}" -1 )"
|
|
+ last_chunk="$(echo "$chunk" | "${TAIL}" -n 1 )"
|
|
echo "$last_chunk" | "${CUT}" -f 2 -d "-"
|
|
else
|
|
echo 0
|
|
fi
|
|
@@ -684,10 +684,10 @@ function show_info()
|
|
total_xferd="0";
|
|
|
|
while test "$parsing"
|
|
do
|
|
- firstline="$(echo "$parsing" | "${HEAD}" -1)"
|
|
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
|
|
+ firstline="$(echo "$parsing" | "${HEAD}" -n 1)"
|
|
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
|
|
|
|
xferd="$(echo "$firstline" | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
|
|
errxfer="$(echo "$firstline" | "${CUT}" -f 4 -d ":" | "${CUT}" -f 2 -d "=")"
|
|
succxfer="$(echo "$firstline" | "${CUT}" -f 5 -d ":" | "${CUT}" -f 2 -d "=")"
|
|
@@ -776,10 +776,10 @@ function process_log()
|
|
parsing="$data"
|
|
# chunk=""
|
|
|
|
while test "$parsing" ;do
|
|
- firstline="$(echo "$parsing" | "${HEAD}" -1)"
|
|
- parsing="$(echo "$parsing" | "${TAIL}" +2)"
|
|
+ firstline="$(echo "$parsing" | "${HEAD}" -n 1)"
|
|
+ parsing="$(echo "$parsing" | "${TAIL}" -n +2)"
|
|
|
|
ipos="$(echo $firstline | "${CUT}" -f 1 -d ":" | "${CUT}" -f 2 -d "=")"
|
|
xferd="$(echo $firstline | "${CUT}" -f 2 -d ":" | "${CUT}" -f 2 -d "=")"
|
|
rev="$(echo $firstline | "${CUT}" -f 3 -d ":")"
|
|
@@ -814,21 +814,21 @@ function load_log()
|
|
#
|
|
# loading into memory Summary info found in log file...
|
|
#
|
|
# line number of last save_log entry...
|
|
- lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -3)
|
|
+ lnb_save=$("${CAT}" -n "$logfile" | "$tr" -d "\\r" | grep "chunk:" -A 2 | "${TAIL}" -n 3)
|
|
|
|
|
|
if test "$lnb_save" ;then
|
|
- lnb_save=$(echo $lnb_save | "${HEAD}" -1 | cut -f 1 -d " ")
|
|
+ lnb_save=$(echo $lnb_save | "${HEAD}" -n 1 | cut -f 1 -d " ")
|
|
|
|
- end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" "+$lnb_save")"
|
|
+ end_log="$(cat "$logfile" | "$tr" -d "\\r" | "${TAIL}" -n "+$lnb_save")"
|
|
|
|
- last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -3)
|
|
+ last_lines=$(echo "$end_log" | grep "chunk:" -A 2 | "${TAIL}" -n 3)
|
|
|
|
- log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -1 )
|
|
- log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -1 )
|
|
- log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -1 )
|
|
+ log=$(echo "$last_lines" | "$GREP" "chunk" | "${TAIL}" -n 1 )
|
|
+ log1=$(echo "$last_lines" | "$GREP" "logcontent" | "${TAIL}" -n 1 )
|
|
+ log2=$(echo "$last_lines" | "$GREP" "eof" | "${TAIL}" -n 1 )
|
|
|
|
if test "$log" && test "$log1" && test "$log2" ;then
|
|
chunk="$(echo "$log" | "${CUT}" -f 2- -d ":" | "${TR}" ":" "\n")"
|
|
|