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 | 5117492620609fd3ea940b1d5851670ba61e9320 (patch) | |
| tree | 7c40bbda7d63ab145a5a7a0cb75131489b25b21a | |
| parent | 73f78a4888b3bb01a1586cba5aca8689655c58f5 (diff) | |
| parent | 1902edaf52b66145b0222c6586c2acb9d71980f0 (diff) | |
| download | tor-5117492620609fd3ea940b1d5851670ba61e9320.tar.gz tor-5117492620609fd3ea940b1d5851670ba61e9320.zip | |
Merge branch 'maint-0.3.5' into release-0.3.5
| -rwxr-xr-x | doc/asciidoc-helper.sh | 9 | ||||
| -rwxr-xr-x | scripts/ci/ci-driver.sh | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh index 2b63154441..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; @@ -46,8 +47,8 @@ elif [ "$1" = "man" ]; then echo "=================================="; exit 1; fi - if "$2" -f manpage $input; then - mv $base.1 $output; + if "$2" -f manpage "$input"; then + mv "$base.1" "$output"; else cat<<EOF ================================== diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index f99e45e6f2..61f97a91d4 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. |