From 3ac5a772e4f8e92d3f32ef56ad9d32d44e8336c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Oto=20=C5=A0=C5=A5=C3=A1va?= Date: Wed, 10 Jan 2024 14:49:11 +0100 Subject: [PATCH] scripts/make-doc.sh: backport changes from 6.0 --- scripts/make-doc.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/scripts/make-doc.sh b/scripts/make-doc.sh index d41e234c9..35c4e73a7 100755 --- a/scripts/make-doc.sh +++ b/scripts/make-doc.sh @@ -1,20 +1,15 @@ #!/bin/bash # SPDX-License-Identifier: GPL-3.0-or-later -cd "$(dirname ${0})/.." +set -o errexit -o nounset +cd "$(dirname "${0}")/.." pushd doc doxygen popd -SPHINX=$(command -v sphinx-build-3) -if [ $? -ne 0 ]; then - SPHINX=$(command -v sphinx-build) -fi - -set -o errexit -o nounset - +SPHINX=$(type -P sphinx-build-3 sphinx-build | head -n1) rm -rf doc/html -${SPHINX} ${@} -b html -d doc/.doctrees doc doc/html +"$SPHINX" "$@" -b html -d doc/.doctrees doc doc/html if command -v makeinfo &>/dev/null; then rm -rf doc/texinfo -- 2.47.2