Reduce number of grep invocations + prettify + wrap param expansion in quotes

1 files changed, 15 insertions, 14 deletions

diff --git a/tools/ci/jobs/nsiqcppstyle.sh b/tools/ci/jobs/nsiqcppstyle.sh
index e1969e182..a6db88cc9 100755
--- a/tools/ci/jobs/nsiqcppstyle.sh
+++ b/tools/ci/jobs/nsiqcppstyle.sh
@@ -8,22 +8,23 @@ rm -rf nsiqcppstyle.git
 ./tools/ci/scripts/retry.sh git clone https://gitlab.com/4144/nsiqcppstyle nsiqcppstyle.git
 
 ./nsiqcppstyle.git/nsiqcppstyle --ci --show-url src \
-| grep -v "catch.hpp" \
-| grep -v "doctest.h" \
-| grep -v "sdl2gfx" \
-| grep -v "/debug/" \
->logs/nsiqcppstyle1.log
+  | grep -v -e "catch.hpp" \
+         -e "doctest.h" \
+         -e "sdl2gfx" \
+         -e "/debug/" \
+    > logs/nsiqcppstyle1.log
 
 cat logs/nsiqcppstyle1.log \
-| grep -v -E "gamemodifiers[.]cpp(.+):  Incorrect align on long parameter list in front of '(N_|{|})'" \
-| grep -v -E "graphics_calcImageRect[.]hpp(.+):  function [(]calcTileVertexesInline[)] has non named parameter" \
-| grep -v -E "dye[.]cpp(.+):  Do not use goto keyword" \
-| grep -v -E "item/item[.]cpp(.+):  function [(]dragDrop[)] has non named parameter" \
-| grep -v -E "windowmenu[.]cpp(.+):  function [(]addButton[)] has non named parameter" \
-| grep -v -E "windowmenu[.]cpp(.+):  Incorrect align on long parameter list in front of '(.|Visible_true)', it should be aligen in column 15" \
-| grep -v -E "channeltab[.]h(.+):  Incorrect align on long parameter list in front of 'const'" \
-| grep -v -E "/enums/simpletypes/(.+):  function [(]defIntEnum[)] has non named parameter" \
->${ERRFILE}
+  | grep -v -E \
+         -e "gamemodifiers[.]cpp(.+):  Incorrect align on long parameter list in front of '(N_|{|})'" \
+         -e "graphics_calcImageRect[.]hpp(.+):  function [(]calcTileVertexesInline[)] has non named parameter" \
+         -e "dye[.]cpp(.+):  Do not use goto keyword" \
+         -e "item/item[.]cpp(.+):  function [(]dragDrop[)] has non named parameter" \
+         -e "windowmenu[.]cpp(.+):  function [(]addButton[)] has non named parameter" \
+         -e "windowmenu[.]cpp(.+):  Incorrect align on long parameter list in front of '(.|Visible_true)', it should be aligen in column 15" \
+         -e "channeltab[.]h(.+):  Incorrect align on long parameter list in front of 'const'" \
+         -e "/enums/simpletypes/(.+):  function [(]defIntEnum[)] has non named parameter" \
+    > "${ERRFILE}"
 
 export data=$(cat ${ERRFILE})
 if [ "$DATA" != "" ]; then