DeforaOS/Panel
DeforaOS/Panel
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update the helper scripts from DeforaOS configure

Browse Source
This commit is contained in:
Pierre Pronchery 2022-05-14 00:00:03 +02:00
parent 030ddbabfc
commit 6e3083dd43
4 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/docbook.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -34,7 +34,7 @@ FOP="fop"
INSTALL="install -m 0644" INSTALL="install -m 0644"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
XMLLINT="xmllint" XMLLINT="xmllint --nonet --xinclude"
XSLTPROC="xsltproc --nonet --xinclude" XSLTPROC="xsltproc --nonet --xinclude"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"

6
tests/fixme.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -199,10 +199,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }

34
tests/htmllint.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -32,6 +32,7 @@ PROJECTCONF="../project.conf"
#executables #executables
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
ECHO="/bin/echo"
FIND="find" FIND="find"
HTMLLINT="xmllint --html --nonet" HTMLLINT="xmllint --html --nonet"
MKDIR="mkdir -p" MKDIR="mkdir -p"
@ -46,9 +47,9 @@ TR="tr"
_htmllint() _htmllint()
{ {
res=0 res=0
subdirs=
$DATE $DATE
echo
while read line; do while read line; do
case "$line" in case "$line" in
"["*) "["*)
@ -60,17 +61,28 @@ _htmllint()
;; ;;
esac esac
done < "$PROJECTCONF" done < "$PROJECTCONF"
if [ ! -n "$subdirs" ]; then
_error "Could not locate directories to analyze"
return $?
fi
for subdir in $subdirs; do for subdir in $subdirs; do
[ -d "../$subdir" ] || continue [ -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" $DEBUG $HTMLLINT "$filename" 2>&1 > "$DEVNULL"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$filename:" echo " OK"
echo "$PROGNAME: $filename: OK" 1>&2
else else
echo "FAIL"
echo "$PROGNAME: $filename: FAIL" 1>&2 echo "$PROGNAME: $filename: FAIL" 1>&2
res=2 res=2
fi fi
done done << EOF
$($FIND "../$subdir" -type f -a \( -iname '*.html' -o -iname '*.htm' \) | $SORT)
EOF
done done
return $res return $res
} }
@ -81,10 +93,14 @@ _debug()
{ {
echo "$@" 1>&3 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
} }

23
tests/xmllint.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$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 #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -32,11 +32,12 @@ PROJECTCONF="../project.conf"
#executables #executables
DATE="date" DATE="date"
DEBUG="_debug" DEBUG="_debug"
ECHO="/bin/echo"
FIND="find" FIND="find"
MKDIR="mkdir -p" MKDIR="mkdir -p"
SORT="sort -n" SORT="sort -n"
TR="tr" TR="tr"
XMLLINT="xmllint --nonet" XMLLINT="xmllint --nonet --xinclude"
[ -f "$CONFIGSH" ] && . "$CONFIGSH" [ -f "$CONFIGSH" ] && . "$CONFIGSH"
@ -49,7 +50,6 @@ _xmllint()
subdirs= subdirs=
$DATE $DATE
echo
while read line; do while read line; do
case "$line" in case "$line" in
"["*) "["*)
@ -67,15 +67,22 @@ _xmllint()
fi fi
for subdir in $subdirs; do for subdir in $subdirs; do
[ -d "../$subdir" ] || continue [ -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" $DEBUG $XMLLINT "$filename" 2>&1 > "$DEVNULL"
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "$filename:" echo " OK"
echo "$PROGNAME: $filename: OK" 1>&2
else else
echo "FAIL"
echo "$PROGNAME: $filename: FAIL" 1>&2 echo "$PROGNAME: $filename: FAIL" 1>&2
res=2 res=2
fi fi
done done << EOF
$($FIND "../$subdir" -type f -a \( -iname '*.xml' -o -iname '*.xsl' \) | $SORT)
EOF
done done
return $res return $res
} }
@ -86,10 +93,6 @@ _debug()
{ {
echo "$@" 1>&3 echo "$@" 1>&3
"$@" "$@"
res=$?
#ignore errors when the command is not available
[ $res -eq 127 ] && return 0
return $res
} }