March 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.0] Restore support for test-network.sh on BSD and other systems without bash
by nickm＠torproject.org 01 Mar '17

01 Mar '17

commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:21:07 2017 +1100 Restore support for test-network.sh on BSD and other systems without bash (But use bash if it's available.) This is a workaround until we remove bash-specific code in 19699. Fixes bug 21581; bugfix on 21562, not in any released version of tor. --- changes/bug21581 | 5 +++++ src/test/test-network.sh | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug21581 b/changes/bug21581 new file mode 100644 index 0000000..1077719 --- /dev/null +++ b/changes/bug21581 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Restore support for test-network.sh on BSD and other systems without + bash. (But use bash if it's available.) This is a workaround until we + remove bash-specific code in 19699. + Fixes bug 21581; bugfix on 21562, not in any released version of tor. diff --git a/src/test/test-network.sh b/src/test/test-network.sh index cb10f72..edd2897 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,9 +1,19 @@ -#! /bin/bash +#! /bin/sh + +# use bash if it is available, as this script doesn't work well in non-bash sh +# this will be fixed in #19699 +# there is no simple, portable way of checking the name of the shell, so we +# exec bash even when sh is bash +if [ -x /bin/bash -a "$USING_BASH" != true ]; then + # only do this once + export USING_BASH=true + exec /bin/bash "$0" "$@" +fi # Please do not modify this script, it has been moved to chutney/tools -export ECHO=${ECHO:-"echo"} -export ECHO_N=${ECHO_N:-"/bin/echo -n"} +export ECHO="${ECHO:-echo}" +export ECHO_N="${ECHO_N:-/bin/echo -n}" # Output is prefixed with the name of the script myname=$(basename $0) @@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then # can be removed, because this script will find chutney, then pass all # arguments to chutney's test-network.sh export TEST_NETWORK_RECURSING=true + # passing arguments to a sourced script only works in bash + # this will be fixed in #19699 . "$0" --dry-run "$@" # Call the chutney version of this script, if it exists, and we can find it @@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR if [ "$NETWORK_DRY_RUN" = true ]; then # we can't exit here, it breaks argument processing # this only works in bash: return semantics are shell-specific + # this will be fixed in #19699 return 2>/dev/null || exit fi

1 0

[chutney/master] Produce a sensible output from warnings.sh if readlink is not available
by teor＠torproject.org 01 Mar '17

01 Mar '17

commit fda220c48f12b7e6578bad07df2e8b0d374de4d0 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:14:58 2017 +1100 Produce a sensible output from warnings.sh if readlink is not available --- tools/warnings.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/warnings.sh b/tools/warnings.sh index 109032b..4ef91ee 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -63,7 +63,7 @@ show_warnings() { fi if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \ -e "$IGNORE_FILE" ]; then - PERMANENT_DIR=`readlink -n "$1"` + PERMANENT_DIR=`readlink -n "$1" || echo "$1"` $ECHO_A "${GREEN}Detail: chutney/tools/warnings.sh $PERMANENT_DIR${NC}" fi # Display the warnings, after filtering and counting occurrences

1 0

[chutney/master] Use sh rather than bash
by teor＠torproject.org 01 Mar '17

01 Mar '17

commit 030e2b98173e2177666957abbb2750830e758b12 Author: teor <teor2345(a)gmail.com> Date: Wed Mar 1 11:05:05 2017 +1100 Use sh rather than bash And fix some bash-isms. This restores support for BSDs without bash installed. Reverts 0d57f92. Closes 21575. --- chutney | 2 +- tools/bootstrap-network.sh | 2 +- tools/hsaddress.sh | 9 ++++----- tools/test-network.sh | 10 +++++----- tools/warnings.sh | 6 +++--- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/chutney b/chutney index 0d4b391..f231e66 100755 --- a/chutney +++ b/chutney @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh set -o errexit set -o nounset diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 7fb2eed..49afbd8 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # 1. potentially stop running network # 2. bootstrap a network from scratch as quickly as possible diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh index 517c6b5..00645d7 100755 --- a/tools/hsaddress.sh +++ b/tools/hsaddress.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Usage: # tools/hsaddress.sh [hs_node] @@ -31,12 +31,12 @@ NAME=$(basename "$0") DEST="$CHUTNEY_DATA_DIR/nodes" TARGET=hidden_service/hostname -function usage() { +usage() { echo "Usage: $NAME [hs_node]" exit 1 } -function show_address() { +show_address() { cat "$1" } @@ -54,8 +54,7 @@ then elif [ $# -eq 1 ]; then [ -d "$DEST/$1" ] || { echo "$NAME: $1 not found"; exit 1; } - # support hOLD - [[ "$1" =~ .*h.* ]] || { echo "$NAME: $1 is not a HS"; exit 1; } + # we don't check the name of the HS directory, because tags vary FILE="$DEST/$1/$TARGET" [ -e "$FILE" ] || { echo "$NAME: $FILE not found"; exit 1; } show_address "$FILE" diff --git a/tools/test-network.sh b/tools/test-network.sh index bf04dd5..0c8d795 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -1,6 +1,6 @@ -#!/usr/bin/env bash +#!/bin/sh -export ECHO=${ECHO:-"echo"} +export ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script myname=$(basename "$0") @@ -246,9 +246,9 @@ if [ "$NETWORK_DRY_RUN" = true -o "$CHUTNEY_WARNINGS_ONLY" = true ]; then if [ "$CHUTNEY_WARNINGS_ONLY" = true ]; then "$WARNINGS" fi - # we can't exit here, it breaks argument processing - # this only works in bash: return semantics are shell-specific - return 2>/dev/null || exit + # This breaks sourcing this script: that is intentional, as the previous + # behaviour only worked with bash as /bin/sh + exit fi "$CHUTNEY_PATH/tools/bootstrap-network.sh" "$NETWORK_FLAVOUR" || exit 3 diff --git a/tools/warnings.sh b/tools/warnings.sh index da17eda..109032b 100755 --- a/tools/warnings.sh +++ b/tools/warnings.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Usage: # tools/warnings.sh [node] @@ -31,7 +31,7 @@ if [ -d "$PWD/$CHUTNEY_DATA_DIR" ]; then export CHUTNEY_DATA_DIR="$PWD/$CHUTNEY_DATA_DIR" fi -function show_warnings() { +show_warnings() { # Work out the file and filter settings if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then FILE="$1/*/$LOG_FILE" @@ -75,7 +75,7 @@ function show_warnings() { fi } -function usage() { +usage() { echo "Usage: $NAME [node]" exit 1 }

1 0