Update the scripts from DeforaOS configure

This commit is contained in:
Pierre Pronchery 2021-09-17 10:20:03 +02:00
parent dca219b7b6
commit 83a1bf0b71
3 changed files with 15 additions and 16 deletions

View File

@ -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"

View File

@ -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
}

View File

@ -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:
@ -31,6 +31,7 @@ PROJECTCONF="../project.conf"
#executables
DATE="date"
DEBUG="_debug"
ECHO="/bin/echo"
FIND="find"
MKDIR="mkdir -p"
SHLINT="sh -n"
@ -48,7 +49,6 @@ _shlint()
subdirs=
$DATE
echo
while read line; do
case "$line" in
"["*)
@ -66,15 +66,22 @@ _shlint()
fi
for subdir in $subdirs; do
[ -d "../$subdir" ] || continue
for filename in $($FIND "../$subdir" -type f -a -name '*.sh' | $SORT); do
while read filename; do
[ -n "$filename" ] || continue
echo
$ECHO -n "$filename:"
_shlint_file "$filename"
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 '*.sh' | $SORT)
EOF
done
return $res
}
@ -107,10 +114,6 @@ _debug()
{
echo "$@" 1>&3
"$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
}