commit 4f8dc02043f3a732e3ad49497a9d4965cd45ded3 Author: teor (Tim Wilson-Brown) <teor2345@gmail.com> Date: Wed Jul 20 10:39:41 2016 +1000 Find CHUTNEY_PATH based on the script's location And do this before checking TOR_DIR, which is optional. --- tools/test-network.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/test-network.sh b/tools/test-network.sh index ccd9f53..1d4816e 100755 --- a/tools/test-network.sh +++ b/tools/test-network.sh @@ -113,6 +113,10 @@ if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then if [ -x "$PWD/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$PWD" export CHUTNEY_PATH="$PWD" + elif [ -d "`dirname \"$0\"`/.." -a \ + -x "`dirname \"$0\"`/../chutney" ]; then + echo "$myname: \$CHUTNEY_PATH not valid, using this script's location" + export CHUTNEY_PATH="`dirname \"$0\"`/.." elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \ -x "$TOR_DIR/../chutney/chutney" ]; then echo "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney"