From 6e3083dd43ba1612fefaf2fb83c3ee50153c66a6 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Sat, 14 May 2022 00:00:03 +0200
Subject: [PATCH] Update the helper scripts from DeforaOS configure

---
 doc/docbook.sh    |  4 ++--
 tests/fixme.sh    |  6 +-----
 tests/htmllint.sh | 34 +++++++++++++++++++++++++---------
 tests/xmllint.sh  | 23 +++++++++++++----------
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/doc/docbook.sh b/doc/docbook.sh
index 83bbf54..d3ca1cd 100755
--- a/doc/docbook.sh
+++ b/doc/docbook.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2021 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -34,7 +34,7 @@ FOP="fop"
 INSTALL="install -m 0644"
 MKDIR="mkdir -m 0755 -p"
 RM="rm -f"
-XMLLINT="xmllint"
+XMLLINT="xmllint --nonet --xinclude"
 XSLTPROC="xsltproc --nonet --xinclude"
 
 [ -f "$CONFIGSH" ] && . "$CONFIGSH"
diff --git a/tests/fixme.sh b/tests/fixme.sh
index 84319cf..0d15f7d 100755
--- a/tests/fixme.sh
+++ b/tests/fixme.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2017-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2017-2021 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -199,10 +199,6 @@ _debug()
 {
 	echo "$@" 1>&3
 	"$@"
-	res=$?
-	#ignore errors when the command is not available
-	[ $res -eq 127 ]					&& return 0
-	return $res
 }
 
 
diff --git a/tests/htmllint.sh b/tests/htmllint.sh
index 37975c3..7f02f03 100755
--- a/tests/htmllint.sh
+++ b/tests/htmllint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2014-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2014-2021 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -32,6 +32,7 @@ PROJECTCONF="../project.conf"
 #executables
 DATE="date"
 DEBUG="_debug"
+ECHO="/bin/echo"
 FIND="find"
 HTMLLINT="xmllint --html --nonet"
 MKDIR="mkdir -p"
@@ -46,9 +47,9 @@ TR="tr"
 _htmllint()
 {
 	res=0
+	subdirs=
 
 	$DATE
-	echo
 	while read line; do
 		case "$line" in
 			"["*)
@@ -60,17 +61,28 @@ _htmllint()
 				;;
 		esac
 	done < "$PROJECTCONF"
+	if [ ! -n "$subdirs" ]; then
+		_error "Could not locate directories to analyze"
+		return $?
+	fi
 	for subdir in $subdirs; do
 		[ -d "../$subdir" ] || continue
-		for filename in $($FIND "../$subdir" -type f -a \( -iname '*.html' -o -iname '*.htm' \) | $SORT); do
+		while read filename; do
+			[ -n "$filename" ] || continue
+			echo
+			$ECHO -n "$filename:"
 			$DEBUG $HTMLLINT "$filename" 2>&1 > "$DEVNULL"
 			if [ $? -eq 0 ]; then
-				echo "$filename:"
+				echo " OK"
+				echo "$PROGNAME: $filename: OK" 1>&2
 			else
+				echo "FAIL"
 				echo "$PROGNAME: $filename: FAIL" 1>&2
 				res=2
 			fi
-		done
+		done << EOF
+$($FIND "../$subdir" -type f -a \( -iname '*.html' -o -iname '*.htm' \) | $SORT)
+EOF
 	done
 	return $res
 }
@@ -81,10 +93,14 @@ _debug()
 {
 	echo "$@" 1>&3
 	"$@"
-	res=$?
-	#ignore errors when the command is not available
-	[ $res -eq 127 ]					&& return 0
-	return $res
+}
+
+
+#error
+_error()
+{
+	echo "$PROGNAME: $@" 1>&2
+	return 2
 }
 
 
diff --git a/tests/xmllint.sh b/tests/xmllint.sh
index 6773845..d9152b1 100755
--- a/tests/xmllint.sh
+++ b/tests/xmllint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2014-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2014-2021 Pierre Pronchery <khorben@defora.org>
 #
 #Redistribution and use in source and binary forms, with or without
 #modification, are permitted provided that the following conditions are met:
@@ -32,11 +32,12 @@ PROJECTCONF="../project.conf"
 #executables
 DATE="date"
 DEBUG="_debug"
+ECHO="/bin/echo"
 FIND="find"
 MKDIR="mkdir -p"
 SORT="sort -n"
 TR="tr"
-XMLLINT="xmllint --nonet"
+XMLLINT="xmllint --nonet --xinclude"
 
 [ -f "$CONFIGSH" ] && . "$CONFIGSH"
 
@@ -49,7 +50,6 @@ _xmllint()
 	subdirs=
 
 	$DATE
-	echo
 	while read line; do
 		case "$line" in
 			"["*)
@@ -67,15 +67,22 @@ _xmllint()
 	fi
 	for subdir in $subdirs; do
 		[ -d "../$subdir" ] || continue
-		for filename in $($FIND "../$subdir" -type f -a \( -name '*.xml' -o -name '*.xsl' \) | $SORT); do
+		while read filename; do
+			[ -n "$filename" ] || continue
+			echo
+			$ECHO -n "$filename:"
 			$DEBUG $XMLLINT "$filename" 2>&1 > "$DEVNULL"
 			if [ $? -eq 0 ]; then
-				echo "$filename:"
+				echo " OK"
+				echo "$PROGNAME: $filename: OK" 1>&2
 			else
+				echo "FAIL"
 				echo "$PROGNAME: $filename: FAIL" 1>&2
 				res=2
 			fi
-		done
+		done << EOF
+$($FIND "../$subdir" -type f -a \( -iname '*.xml' -o -iname '*.xsl' \) | $SORT)
+EOF
 	done
 	return $res
 }
@@ -86,10 +93,6 @@ _debug()
 {
 	echo "$@" 1>&3
 	"$@"
-	res=$?
-	#ignore errors when the command is not available
-	[ $res -eq 127 ]					&& return 0
-	return $res
 }