diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-11-03 09:49:07 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-11-03 09:49:07 -0400 |
| commit | 755485342ca8e40b8d29864cd50531dc39954530 (patch) | |
| tree | 42dd4e01000c1a931790d061bf093e1109ce9eec | |
| parent | f6600377b495c276cbaf423d9c8907abd4cb3c82 (diff) | |
| parent | 621f8ac418e1441c9fe568b015058438daba6616 (diff) | |
| download | tor-755485342ca8e40b8d29864cd50531dc39954530.tar.gz tor-755485342ca8e40b8d29864cd50531dc39954530.zip | |
Merge branch 'maint-0.4.6'
Signed-off-by: David Goulet <dgoulet@torproject.org>
| -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 fdaab05b8e..98e216e68a 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 8d009adb59..aded45048a 100755 --- 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. |