diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2023-09-10 13:33:28 +0200 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2023-09-10 13:33:28 +0200 |
| commit | 3f68449293de30d84e39fef761ca5a4734f99c32 (patch) | |
| tree | b42fdeb4d513d47e2a1602f1b57876c7dc25317c /tools/ci/jobs/deheader2.sh | |
| parent | 1999cc4ec6a8d14730edb3c98dbf72011fce9ba6 (diff) | |
| download | plus-3f68449293de30d84e39fef761ca5a4734f99c32.tar.gz plus-3f68449293de30d84e39fef761ca5a4734f99c32.tar.bz2 plus-3f68449293de30d84e39fef761ca5a4734f99c32.tar.xz plus-3f68449293de30d84e39fef761ca5a4734f99c32.zip | |
Reduce number of grep invocations + prettify + wrap param expansion in quotes
Diffstat (limited to 'tools/ci/jobs/deheader2.sh')
| -rwxr-xr-x | tools/ci/jobs/deheader2.sh | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/tools/ci/jobs/deheader2.sh b/tools/ci/jobs/deheader2.sh index afd0f02c3..5862e555e 100755 --- a/tools/ci/jobs/deheader2.sh +++ b/tools/ci/jobs/deheader2.sh @@ -14,20 +14,22 @@ if [[ -n "${DATA}" ]]; then exit 1 fi -grep "deheader:" ${LOGFILE} \ -| grep -v "deheader: remove <climits> from ./src/being/localplayer.cpp" \ -| grep -v "deheader: remove <fstream> from ./src/utils/files.cpp" \ -| grep -v "deheader: remove <climits> from ./src/resources/map/map.cpp" \ -| grep -v "deheader: remove <sys/time.h> from ./src/resources/wallpaper.cpp" \ -| grep -v "deheader: remove <linux/tcp.h> from ./src/net/sdltcpnet.cpp" \ -| grep -v "deheader: remove <netdb.h> from ./src/net/sdltcpnet.cpp" \ -| grep -v "deheader: remove <netinet/in.h> from ./src/net/sdltcpnet.cpp" \ -| grep -v "deheader: remove <climits> from ./src/resources/map/map.cpp" \ -| grep -v "deheader: remove <vector> from ./src/utils/vector.h" \ -| grep -v "has more than one inclusion of \"resources/dye/dyepalette_replace" \ -| grep -v "/sdl2gfx/" \ -| grep -v "doctest.h" \ -| grep -v "deheader: remove <climits> from ./src/units.cpp" > ${LOGFILE2} +grep "deheader:" "${LOGFILE}" \ + | grep -v \ + -e "deheader: remove <climits> from ./src/being/localplayer.cpp" \ + -e "deheader: remove <fstream> from ./src/utils/files.cpp" \ + -e "deheader: remove <climits> from ./src/resources/map/map.cpp" \ + -e "deheader: remove <sys/time.h> from ./src/resources/wallpaper.cpp" \ + -e "deheader: remove <linux/tcp.h> from ./src/net/sdltcpnet.cpp" \ + -e "deheader: remove <netdb.h> from ./src/net/sdltcpnet.cpp" \ + -e "deheader: remove <netinet/in.h> from ./src/net/sdltcpnet.cpp" \ + -e "deheader: remove <climits> from ./src/resources/map/map.cpp" \ + -e "deheader: remove <vector> from ./src/utils/vector.h" \ + -e "has more than one inclusion of \"resources/dye/dyepalette_replace" \ + -e "/sdl2gfx/" \ + -e "doctest.h" \ + -e "deheader: remove <climits> from ./src/units.cpp" \ + > "${LOGFILE2}" export DATA=$(cat ${LOGFILE2}) if [[ -n "${DATA}" ]]; then |