Integration: update the helper scripts

These are obtained by DeforaOS configure as usual, with configure-update(1).
DeforaOS · Nov 23, 2023 · ab9b56f · ab9b56f
1 parent 9d59bc2
commit ab9b56f
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 45 deletions.
diff --git a/tests/clint.sh b/tests/clint.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2016-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2016-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:
@@ -33,6 +33,7 @@ PROJECTCONF="../project.conf"
 #executables
 DATE="date"
 DEBUG="_debug"
+ECHO="/bin/echo"
 FIND="find"
 GREP="grep"
 LINT="lint -g"
@@ -68,41 +69,52 @@ _clint()
 	fi
 	for subdir in $subdirs; do
 		[ -d "../$subdir" ] || continue
-		for filename in $($FIND "../$subdir" -type f | $SORT); do
+		while read filename; do
+			[ -n "$filename" ] || continue
+			r=0
 			case "$filename" in
 				*.c)
 					echo
-					(_clint_lint "$filename";
-						_clint_rtrim "$filename")
+					_clint_lint "$filename"	|| r=$?
+					_clint_rtrim "$filename"|| r=$?
 					;;
 				*.h)
 					echo
 					echo "$filename:"
-					(_clint_rtrim "$filename")
+					_clint_rtrim "$filename"|| r=$?
 					;;
 				*)
 					continue
 					;;
 			esac
-			if [ $? -ne 0 ]; then
+			if [ $r -eq 0 ]; then
+				echo " OK"
+				echo "$PROGNAME: $filename: OK" 1>&2
+			else
 				echo "FAIL"
 				echo "$PROGNAME: $filename: FAIL" 1>&2
 				res=2
-			else
-				echo "OK"
 			fi
-		done
+		done << EOF
+$($FIND "../$subdir" -type f | $SORT)
+EOF
 	done
 	return $res
 }
 
 _clint_lint()
-{
+{(
 	filename="$1"
 
-	echo -n "${filename%/*}/"
+	$ECHO -n "${filename%/*}/"
 	$DEBUG $LINT $CPPFLAGS $CFLAGS "$filename" 2>&1
-}
+	ret=$?
+	if [ $ret -eq 127 ]; then
+		#XXX ignore errors when $LINT is not available
+		ret=0
+	fi
+	return $ret
+)}
 
 _clint_rtrim()
 {
@@ -118,10 +130,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/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-2022 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:
@@ -95,7 +95,7 @@ _fixme_callback()
 			echo "_fixme_callback_asm"
 			return 0
 			;;
-		c|cc|cpp|cxx|h|js|v)
+		c|cc|cpp|cxx|go|h|js|v)
 			echo "_fixme_callback_c"
 			return 0
 			;;
@@ -122,7 +122,7 @@ _fixme_callback()
 			echo "_fixme_callback_python"
 			return 0
 			;;
-		"<html"*|"<?xml"*)
+		"<!DOCTYPE"*|"<!doctype"*|"<HTML"*|"<html"*|"<?xml"*)
 			echo "_fixme_callback_xml"
 			return 0
 			;;
@@ -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
@@ -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
@@ -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
 }
 
 

diff --git a/tools/subst.sh b/tools/subst.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$Id$
-#Copyright (c) 2012-2020 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2012-2022 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:
@@ -29,18 +29,19 @@ CONFIGSH="${0%/subst.sh}/../config.sh"
 PREFIX="/usr/local"
 BINDIR=
 DATADIR=
+DEVNULL="/dev/null"
 INCLUDEDIR=
 LDSO=
 LIBDIR=
 LIBEXECDIR=
 MANDIR=
 PROGNAME="subst.sh"
+SBINDIR=
 SYSCONFDIR=
 #executables
 CHMOD="chmod"
 DATE="date"
 DEBUG="_debug"
-DEVNULL="/dev/null"
 INSTALL="install"
 MKDIR="mkdir -m 0755 -p"
 RM="rm -f"
@@ -85,6 +86,7 @@ _subst()
 		SYSCONFDIR="$PREFIX/etc"
 		[ "$PREFIX" = "/usr" ] && SYSCONFDIR="/etc"
 	fi
+	[ -z "$SBINDIR" ] && SBINDIR="$PREFIX/sbin"
 
 	while [ $# -gt 0 ]; do
 		target="$1"
@@ -115,7 +117,8 @@ _subst()
 		source="${source}.in"
 		([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \
 								|| return 2
-		$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \
+		$DEBUG $SED -e "s;@VENDOR@;$VENDOR;g" \
+			-e "s;@PACKAGE@;$PACKAGE;g" \
 			-e "s;@VERSION@;$VERSION;g" \
 			-e "s;@PREFIX@;$PREFIX;g" \
 			-e "s;@BINDIR@;$BINDIR;g" \
@@ -127,6 +130,7 @@ _subst()
 			-e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \
 			-e "s;@MANDIR@;$MANDIR;g" \
 			-e "s;@PWD@;$PWD;g" \
+			-e "s;@SBINDIR@;$SBINDIR;g" \
 			-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
 			-- "$source" > "$target"
 		if [ $? -ne 0 ]; then
@@ -139,6 +143,7 @@ _subst()
 	return 0
 }
 
+
 #debug
 _debug()
 {