commit 755485342ca8e40b8d29864cd50531dc39954530 Merge: f6600377b4 621f8ac418 Author: David Goulet <dgou...@torproject.org> Date: Wed Nov 3 09:49:07 2021 -0400
Merge branch 'maint-0.4.6' Signed-off-by: David Goulet <dgou...@torproject.org> doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --cc doc/asciidoc-helper.sh index fdaab05b8e,3706ca2e14..98e216e68a --- a/doc/asciidoc-helper.sh +++ b/doc/asciidoc-helper.sh @@@ -9,10 -9,11 +9,11 @@@ set -e if [ $# != 3 ]; then - exit 1; + exit 1 fi - export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct') + SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')" + export SOURCE_DATE_EPOCH output=$3 @@@ -21,16 -22,16 +22,16 @@@ if [ "$1" = "html" ]; the base=${output%%.html.in} if [ "$2" != none ]; then - TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input"; - TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input"; ++ TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input"; else - echo "=================================="; - echo; - echo "You need asciidoc installed to be able to build the manpage."; - echo "To build without manpages, use the --disable-asciidoc argument"; - echo "when calling configure."; - echo; - echo "=================================="; - exit 1; + echo "==================================" + echo + echo "You need asciidoc installed to be able to build the manpage." + echo "To build without manpages, use the --disable-asciidoc argument" + echo "when calling configure." + echo + echo "==================================" + exit 1 fi elif [ "$1" = "man" ]; then input=${output%%.1.in}.1.txt _______________________________________________ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits