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

1 files changed, 21 insertions, 19 deletions

diff --git a/tools/ci/scripts/deheaderS.sh b/tools/ci/scripts/deheaderS.sh
index 6f72ddb50..b9a6730c0 100755
--- a/tools/ci/scripts/deheaderS.sh
+++ b/tools/ci/scripts/deheaderS.sh
@@ -22,22 +22,24 @@ fi
 echo $1 >>${LOGFILE}
 echo $1
 
-${dir}/deheader -q -i "\"debug.h\"" \
--i "\"utils/checkutils.h\"" \
--i "\"utils/sdlcheckutils.h\"" \
--i "\"sdlshared.h\"" \
--i "\"localconsts.h\"" \
--i "\"utils/fuzzer.h\"" \
--i "\"$name\"" \
--c "$CXX" \
--d "$FLAGS" \
--s "-std=gnu++1z" \
--S "-std=gnu++1z" \
--m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DUCHAR_TYPE=uint16_t -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \
-grep -v "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of <netinet/tcp.h>" | \
-grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
-grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \
-grep -v "portability requires" | \
-grep -v "SDL2_rotozoom.cpp" | \
-grep -v "doctest.h" | \
-tee -a ${LOGFILE}
+"${dir}/deheader" -q \
+                  -i "\"debug.h\"" \
+                  -i "\"utils/checkutils.h\"" \
+                  -i "\"utils/sdlcheckutils.h\"" \
+                  -i "\"sdlshared.h\"" \
+                  -i "\"localconsts.h\"" \
+                  -i "\"utils/fuzzer.h\"" \
+                  -i "\"$name\"" \
+                  -c "$CXX" \
+                  -d "$FLAGS" \
+                  -s "-std=gnu++1z" \
+                  -S "-std=gnu++1z" \
+                  -m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DUCHAR_TYPE=uint16_t -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" \
+                  "$1" 2>&1 \
+  | grep -v -e "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of <netinet/tcp.h>" \
+            -e "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" \
+            -e "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" \
+            -e "portability requires" \
+            -e "SDL2_rotozoom.cpp" \
+            -e "doctest.h" \
+    | tee -a "${LOGFILE}"