tor

commit 755485342ca8e40b8d29864cd50531dc39954530
parent f6600377b495c276cbaf423d9c8907abd4cb3c82
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed,  3 Nov 2021 09:49:07 -0400

Merge branch 'maint-0.4.6'

Signed-off-by: David Goulet <dgoulet@torproject.org>

Diffstat:
M
doc/asciidoc-helper.sh
 | 
5
+++--
M
scripts/ci/ci-driver.sh
 | 
2
+-

2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
@@ -12,7 +12,8 @@ if [ $# != 3 ]; then
     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,7 +22,7 @@ if [ "$1" = "html" ]; then
     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";
     else
         echo "=================================="
         echo
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
@@ -282,7 +282,7 @@ fi
 #############################################################################
 # Determine the version of Tor.
 
-TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;')
+TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; s/\].*//;')
 
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.