colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: cleanup path variable in "tools/check-docs.sh"

Browse Source 
- don't append the path separator to the SOURCEDIR variable.
  Instead, use the path separator when we need it.
This commit is contained in:
Thomas Haller
2019-04-23 11:22:57 +02:00
parent b237c4303f
commit a9b4362fc5
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tools/check-docs.sh
View File

@@ -23,9 +23,9 @@ same_lines() {
libnm_headers() { libnm_headers() {
( (
ls -1 "$1"libnm/*.h "$1"libnm-core/*.h ls -1 "$1/libnm"/*.h "$1/libnm-core"/*.h
if [ -n "$2" ]; then if [ -n "$2" ]; then
ls -1 "$2"/libnm/*.h "$2"/libnm-core/*.h ls -1 "$2/libnm"/*.h "$2/libnm-core"/*.h
fi fi
) | sort | uniq ) | sort | uniq
} }
@@ -36,28 +36,28 @@ BUILDDIR="$2"
if test "$SOURCEDIR" == "$BUILDDIR"; then if test "$SOURCEDIR" == "$BUILDDIR"; then
BUILDDIR= BUILDDIR=
fi fi
[ -n "$SOURCEDIR" ] && SOURCEDIR="$SOURCEDIR/" [ -z "$SOURCEDIR" ] && SOURCEDIR='.'
# Check that the D-Bus API docs contain all known interfaces # Check that the D-Bus API docs contain all known interfaces
F1="$(sed -n 's,^ <xi:include href="dbus-\([^"]*\.xml\)"/>$,\1,p' "$SOURCEDIR"docs/api/network-manager-docs.xml)" F1="$(sed -n 's,^ <xi:include href="dbus-\([^"]*\.xml\)"/>$,\1,p' "$SOURCEDIR/docs/api/network-manager-docs.xml")"
F1_EXTRA=" F1_EXTRA="
org.freedesktop.NetworkManager.Device.WiMax.xml org.freedesktop.NetworkManager.Device.WiMax.xml
org.freedesktop.NetworkManager.WiMax.Nsp.xml org.freedesktop.NetworkManager.WiMax.Nsp.xml
" "
F2="$(cd "$SOURCEDIR"introspection; ls -1 *.xml)" F2="$(cd "$SOURCEDIR/introspection"; ls -1 *.xml)"
if ! same_lines "$F1"$'\n'"$F1_EXTRA" "$F2" ; then if ! same_lines "$F1"$'\n'"$F1_EXTRA" "$F2" ; then
die "*** Error: D-Bus interfaces not included in docs/api/network-manager-docs.xml ***" die "*** Error: D-Bus interfaces not included in docs/api/network-manager-docs.xml ***"
fi fi
# Check that files that define types that are in public libnm API are included in libnm documentation. # Check that files that define types that are in public libnm API are included in libnm documentation.
F1="$(sed -n 's/.*<xi:include href="xml\/\([^"]*\)\.xml".*/\1/p' "$SOURCEDIR"docs/libnm/libnm-docs.xml)" F1="$(sed -n 's/.*<xi:include href="xml\/\([^"]*\)\.xml".*/\1/p' "$SOURCEDIR/docs/libnm/libnm-docs.xml")"
F1_EXTRA=" F1_EXTRA="
nm-core-enum-types nm-core-enum-types
nm-enum-types nm-enum-types
" "
F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR"libnm/libnm.ver | word_regex)" \ F2="$(grep -l "$(sed -n 's/^[\t ]*\(.*_get_type\);/\1/p' "$SOURCEDIR/libnm/libnm.ver" | word_regex)" \
$(libnm_headers "$SOURCEDIR" "$BUILDDIR") \ $(libnm_headers "$SOURCEDIR" "$BUILDDIR") \
| sed 's,.*/\([^/]\+\)\.h$,\1,')" | sed 's,.*/\([^/]\+\)\.h$,\1,')"
F2_EXTRA=" F2_EXTRA="