Skip to content

Commit 1a4c0df

Browse files
committed
Makefile: check-content-markup: echo errors to stderr; neuter input-stealing of nut-ddl.py
Signed-off-by: Jim Klimov <[email protected]>
1 parent 5a59fbb commit 1a4c0df

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,25 @@ check-content-markup:
3838
NUT_DDL_REQUIRE_MANPAGES=False ; \
3939
export NUT_DDL_PEDANTIC_DECLARATIONS NUT_DDL_REQUIRE_MANPAGES; \
4040
find . -type f -name '*.dev' | ( \
41-
echo "`date -u`: Sanity-checking the *.dev files..."; \
41+
echo "`date -u`: Sanity-checking the *.dev files..." >&2 ; \
4242
if [ -x $(NUT_WEBSITE_DIR)/tools/nut-ddl.py ] ; then \
43-
echo "`date -u`: will use $(NUT_DDL_PYTHON) $(NUT_WEBSITE_DIR)/tools/nut-ddl.py for deeper checks" ; \
43+
echo "`date -u`: will use $(NUT_DDL_PYTHON) $(NUT_WEBSITE_DIR)/tools/nut-ddl.py for deeper checks" >&2 ; \
4444
fi ; \
4545
FAILED=""; \
4646
PASSED=""; \
4747
while read F ; do \
4848
if [ -x $(NUT_WEBSITE_DIR)/tools/nut-ddl.py ] ; then \
49-
RES=0 ; $(NUT_DDL_PYTHON) $(NUT_WEBSITE_DIR)/tools/nut-ddl.py "$$F" "$$F.tmp.html" || RES=$$? ; \
49+
RES=0 ; $(NUT_DDL_PYTHON) $(NUT_WEBSITE_DIR)/tools/nut-ddl.py "$$F" "$$F.tmp.html" </dev/null >&2 || RES=$$? ; \
5050
rm -f "$$F.tmp.html" ; \
5151
if [ "$$RES" != 0 ] ; then \
52-
echo "^^^ $$F" && FAILED="$$FAILED $$F" && continue; \
52+
echo "^^^ $$F" >&2 && FAILED="$$FAILED $$F" && continue; \
5353
fi ; \
5454
fi ; \
55-
egrep -v '^( *\#.*|.*:.*)$$' "$$F" | egrep -v '^$$' && echo "^^^ $$F" && FAILED="$$FAILED $$F" && continue; \
55+
egrep -v '^( *\#.*|.*:.*)$$' "$$F" | egrep -v '^$$' >&2 && echo "^^^ $$F" >&2 && FAILED="$$FAILED $$F" && continue; \
5656
PASSED="$$PASSED $$F"; \
5757
done; \
58-
if [ -n "$$FAILED" ]; then echo "`date -u`: FAILED sanity-check in following file(s) : $$FAILED" >&2; exit 1; fi; \
58+
if [ -n "$$FAILED" ]; then echo "`date -u`: FAILED sanity-check (got RES=$$RES) in following file(s) : $$FAILED" >&2; exit 1; fi; \
59+
if [ x"$$RES" != x0 ]; then echo "`date -u`: FAILED sanity-check : got RES=$$RES" >&2; exit $$RES; fi; \
5960
echo "`date -u`: OK : All *.dev files have passed the basic sanity check : $$PASSED"; \
6061
exit 0; \
6162
)

0 commit comments

Comments
 (0)