From c1e55565ceca81dd3cb20f5e01a47e9f4f8cc6fb Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Thu, 3 Dec 2015 09:11:38 -0800 Subject: [PATCH] Cleanup scalastyle script a little. --- dev/scalastyle | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dev/scalastyle b/dev/scalastyle index 945f9ffe21353..b16054cffb41f 100755 --- a/dev/scalastyle +++ b/dev/scalastyle @@ -17,16 +17,15 @@ # limitations under the License. # -echo -e "q\n" | build/sbt -Pkinesis-asl -Phive -Phive-thriftserver scalastyle > scalastyle.txt -echo -e "q\n" | build/sbt -Pkinesis-asl -Phive -Phive-thriftserver test:scalastyle >> scalastyle.txt +mkdir -p target +OUTPUT="target/scalastyle.txt" +echo -e "q\n" | build/sbt -Pkinesis-asl -Phive -Phive-thriftserver scalastyle > "$OUTPUT" +echo -e "q\n" | build/sbt -Pkinesis-asl -Phive -Phive-thriftserver test:scalastyle >> "$OUTPUT" # Check style with YARN built too -echo -e "q\n" | build/sbt -Pkinesis-asl -Pyarn -Phadoop-2.2 scalastyle >> scalastyle.txt -echo -e "q\n" | build/sbt -Pkinesis-asl -Pyarn -Phadoop-2.2 test:scalastyle >> scalastyle.txt +echo -e "q\n" | build/sbt -Pkinesis-asl -Pyarn -Phadoop-2.2 scalastyle >> "$OUTPUT" +echo -e "q\n" | build/sbt -Pkinesis-asl -Pyarn -Phadoop-2.2 test:scalastyle >> "$OUTPUT" -ERRORS=$(cat scalastyle.txt | awk '{if($1~/error/)print}') -mkdir -p target -rm -f target/scalastyle.txt -mv scalastyle.txt target/ +ERRORS=$(cat "$OUTPUT" | awk '{if($1~/error/)print}') if test ! -z "$ERRORS"; then echo -e "Scalastyle checks failed at following occurrences:\n$ERRORS"