diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-11-03 09:47:43 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-11-03 09:47:43 -0400 |
| commit | 621f8ac418e1441c9fe568b015058438daba6616 (patch) | |
| tree | 82c53e677d84d6b2b292aec324dd6f61431eb960 | |
| parent | 9922116388b9904f248f8bfc4d013f4fd38c7972 (diff) | |
| parent | 1e3e921d7d2e7bce2f2b7e35ca085a745d242b66 (diff) | |
| download | tor-621f8ac418e1441c9fe568b015058438daba6616.tar.gz tor-621f8ac418e1441c9fe568b015058438daba6616.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -rwxr-xr-x | doc/asciidoc-helper.sh | 5 | ||||
| -rwxr-xr-x | 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 index 10604d31cf..3706ca2e14 100755 --- 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 index 29889a8fb5..245922b631 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,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. |