commit 9c6885e94d22127fc982bcf7576058a64a905763 Author: teor (Tim Wilson-Brown) teor2345@gmail.com Date: Wed Jul 20 10:39:24 2016 +1000

Find TOR_DIR if it's called tor and next to chutney --- tools/test-network.sh | 6 ++++++ 1 file changed, 6 insertions(+)

diff --git a/tools/test-network.sh b/tools/test-network.sh index 2e0cd7c..ccd9f53 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -92,6 +92,12 @@ if [ ! -d "$TOR_DIR" ]; then # But only if it looks like one echo "$myname: $TOR_DIR not set, trying $PWD" export TOR_DIR="$PWD" + elif [ -d "$PWD/../tor" -a -d "$PWD/../tor/src/or" -a \ + -d "$PWD/../tor/src/tools" ]; then + # Guess the tor directory is next to the current directory + # But only if it looks like one + echo "$myname: $TOR_DIR not set, trying $PWD/../tor" + export TOR_DIR="$PWD/../tor" else echo "$myname: no $TOR_DIR, chutney will use $PATH for tor binaries" unset TOR_DIR