ci: Fix trailing whitespace check

John Andersen · John Andersen · commit 652a9748b6f2 · 2019-11-22T17:08:10.000-08:00
Signed-off-by: John Andersen &lt;john.s.andersen@intel.com&gt;
diff --git a/.ci/run.sh b/.ci/run.sh
@@ -83,11 +83,11 @@ function run_whitespace() {
     rm -f "$whitespace"
   }
   trap rmtempfile EXIT
-  ( find dffml -type f -name \*.py -exec grep -EHn " +$" {} \; ) 2>&1 \
-    | tee "$whitespace"
+  find . -type f -name '*.py' -exec grep -EHn " +$" {} \; 2>&1 > "$whitespace"
   lines=$(wc -l < "$whitespace")
   if [ "$lines" -ne 0 ]; then
     echo "Trailing whitespace found" >&2
+    cat "${whitespace}" >&2
     exit 1
   fi
 }

Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ function run_whitespace() {`
`83`	`83`	`rm -f "$whitespace"`
`84`	`84`	`}`
`85`	`85`	`trap rmtempfile EXIT`
`86`		`- ( find dffml -type f -name \*.py -exec grep -EHn " +$" {} \; ) 2>&1 \`
`87`		`- \| tee "$whitespace"`
	`86`	`+ find . -type f -name '*.py' -exec grep -EHn " +$" {} \; 2>&1 > "$whitespace"`
`88`	`87`	`lines=$(wc -l < "$whitespace")`
`89`	`88`	`if [ "$lines" -ne 0 ]; then`
`90`	`89`	`echo "Trailing whitespace found" >&2`
	`90`	`+ cat "${whitespace}" >&2`
`91`	`91`	`exit 1`
`92`	`92`	`fi`
`93`	`93`	`}`