- tor-commits - lists.torproject.org

[tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1e3e921d7d2e7bce2f2b7e35ca085a745d242b66 Merge: 77f5bfa60e 1902edaf52 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/main] Merge branch 'maint-0.4.6'
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 755485342ca8e40b8d29864cd50531dc39954530 Merge: f6600377b4 621f8ac418 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:49:07 2021 -0400 Merge branch 'maint-0.4.6' Signed-off-by: David Goulet <dgoulet(a)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

1 0

[tor/main] shellcheck: Remove unused variable in ci-driver.sh
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 44671995d10c863d3e7967f8f10d2b599ebfe2e6 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:50:43 2021 -0400 shellcheck: Remove unused variable in ci-driver.sh Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index aded45048a..b5a9c5cbf1 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -288,7 +288,6 @@ TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; # Tor version. Only create the variables we need. TOR_VER_AT_LEAST_043=no TOR_VER_AT_LEAST_044=no -TOR_VER_AT_LEAST_046=no # These are the currently supported Tor versions; no need to work with anything # ancient in this script. @@ -316,7 +315,6 @@ case "$TOR_VERSION" in 0.4.6.*) TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=yes - TOR_VER_AT_LEAST_046=yes ;; esac

1 0

[tor/maint-0.4.5] shellcheck: Make it happy on couple scripts
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1902edaf52b66145b0222c6586c2acb9d71980f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:30 2021 -0400 shellcheck: Make it happy on couple scripts Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 9 +++++---- 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.

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1e3e921d7d2e7bce2f2b7e35ca085a745d242b66 Merge: 77f5bfa60e 1902edaf52 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.5] shellcheck: Make it happy on couple scripts
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1902edaf52b66145b0222c6586c2acb9d71980f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:30 2021 -0400 shellcheck: Make it happy on couple scripts Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 9 +++++---- 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.

1 0

[tor/maint-0.4.6] shellcheck: Make it happy on couple scripts
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1902edaf52b66145b0222c6586c2acb9d71980f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:30 2021 -0400 shellcheck: Make it happy on couple scripts Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 9 +++++---- 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.

1 0

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1e3e921d7d2e7bce2f2b7e35ca085a745d242b66 Merge: 77f5bfa60e 1902edaf52 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 5117492620609fd3ea940b1d5851670ba61e9320 Merge: 73f78a4888 1902edaf52 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:43 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 doc/asciidoc-helper.sh | 9 +++++---- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.5] shellcheck: Make it happy on couple scripts
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 1902edaf52b66145b0222c6586c2acb9d71980f0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:47:30 2021 -0400 shellcheck: Make it happy on couple scripts Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- doc/asciidoc-helper.sh | 9 +++++---- 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.

1 0