[Xen-devel] [OSSTEST PATCH 3/4] line wrapping: Replace many uses of cat with cr-fold-long-lines

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

These are the nicely uniform bits of this change.

This arranges that many of the places where stuff gets put into emails
has their lines wrapped.

Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 cr-daily-branch    |  2 +-
 cri-args-hostlists |  2 +-
 cri-bisect         | 10 +++++-----
 mg-execute-flight  |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cr-daily-branch b/cr-daily-branch
index e1528d49..49b8ad8e 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -547,7 +547,7 @@ if [ -f $revlog ]; then
     revlog_lines=`wc -l <$revlog`
     if [ $revlog_lines -lt 300 ]; then
         echo ------------------------------------------------------------
-        cat $revlog
+        ./cr-fold-long-lines $revlog
     else
         echo "(No revision log; it would be" $revlog_lines "lines long.)"
     fi
diff --git a/cri-args-hostlists b/cri-args-hostlists
index a788e095..3578fe1c 100644
--- a/cri-args-hostlists
+++ b/cri-args-hostlists
@@ -120,7 +120,7 @@ start_email () {
        ./sg-report-flight --html-dir=$flight_html_dir/$flight/ \
                --allow=allow.all --allow=allow.$branch \
                $sgr_args $flight >tmp/$flight.report
-       cat tmp/$flight.report
+       ./cr-fold-long-lines tmp/$flight.report
 
        mkdir -p $host_html_dir
        with-lock-ex -w $globallockdir/report-lock \
diff --git a/cri-bisect b/cri-bisect
index f8fc55a8..576e7511 100644
--- a/cri-bisect
+++ b/cri-bisect
@@ -90,25 +90,25 @@ job $job
 testid $testid
 
 END
-        cat >&3 $summaryfile
-        if $bisgraph; then cat >&3 <<END; fi
+        ./cr-fold-long-lines >&3 $summaryfile
+        if $bisgraph; then ./cr-fold-long-lines >&3 <<END; fi
 
 For bisection revision-tuple graph see:
    $OSSTEST_HTML_URL/$bisleaf.html
 Revision IDs in each graph node refer, respectively, to the Trees above.
 END
-        cat >&3 <<END
+        ./cr-fold-long-lines >&3 <<END
 
 ----------------------------------------
 END
-        cat >&3 $reportfile
+        ./cr-fold-long-lines >&3 $reportfile
         if $flight_executed; then
                 echo >&3 ----------------------------------------
                if [ "x$OSSTEST_HTMLPUB_DIR" != x ]; then
                        sgr_args+=" --html-dir=$OSSTEST_HTMLPUB_DIR/$flight/"
                fi
                 ./sg-report-flight $sgr_args $flight >tmp/$flight.report
-               cat tmp/$flight.report >&3
+               ./cr-fold-long-lines tmp/$flight.report >&3
                 ./cr-publish-flight-logs --push-harness $flight
         fi
         exec 3>&-
diff --git a/mg-execute-flight b/mg-execute-flight
index 98aca45d..349880b0 100755
--- a/mg-execute-flight
+++ b/mg-execute-flight
@@ -97,10 +97,10 @@ END
 git log -n1 --pretty=format:'harness %h: %s' | perl -pe 's/(.{70}).+/$1.../'
 echo
 
-cat <tmp/$flight.report
+./cr-fold-long-lines <tmp/$flight.report
 
 echo ============================================================
-cat <tmp/$flight.transcript
+./cr-fold-long-lines <tmp/$flight.transcript
 
 exec >&2
 
-- 
2.11.0


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel