|
|
@@ -5,7 +5,7 @@
|
|
|
# If we already know CHUTNEY_PATH, don't bother with argument parsing
|
|
|
TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh"
|
|
|
# Call the chutney version of this script, if it exists, and we can find it
|
|
|
-if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then
|
|
|
+if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then
|
|
|
# we can't produce any output, because we might be --quiet
|
|
|
# this preserves arguments with spaces correctly
|
|
|
exec "$TEST_NETWORK" "$@"
|
|
|
@@ -52,12 +52,12 @@ done
|
|
|
# - if $PWD looks like a tor build directory, set it to $PWD, or
|
|
|
# - unset $TOR_DIR, and let chutney fall back to finding tor binaries in $PATH
|
|
|
if [ ! -d "$TOR_DIR" ]; then
|
|
|
- if [ -d "$BUILDDIR/src/core/or" -a -d "$BUILDDIR/src/tools" ]; then
|
|
|
+ if [ -d "$BUILDDIR/src/core/or" ] && [ -d "$BUILDDIR/src/tools" ]; then
|
|
|
# Choose the build directory
|
|
|
# But only if it looks like one
|
|
|
$ECHO "$myname: \$TOR_DIR not set, trying \$BUILDDIR"
|
|
|
TOR_DIR="$BUILDDIR"
|
|
|
- elif [ -d "$PWD/src/core/or" -a -d "$PWD/src/tools" ]; then
|
|
|
+ elif [ -d "$PWD/src/core/or" ] && [ -d "$PWD/src/tools" ]; then
|
|
|
# Guess the tor directory is the current directory
|
|
|
# But only if it looks like one
|
|
|
$ECHO "$myname: \$TOR_DIR not set, trying \$PWD"
|
|
|
@@ -73,12 +73,12 @@ fi
|
|
|
# - if $PWD looks like a chutney directory, set it to $PWD, or
|
|
|
# - set it based on $TOR_DIR, expecting chutney to be next to tor, or
|
|
|
# - fail and tell the user how to clone the chutney repository
|
|
|
-if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then
|
|
|
+if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then
|
|
|
if [ -x "$PWD/chutney" ]; then
|
|
|
$ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$PWD"
|
|
|
CHUTNEY_PATH="$PWD"
|
|
|
- elif [ -d "$TOR_DIR" -a -d "$TOR_DIR/../chutney" -a \
|
|
|
- -x "$TOR_DIR/../chutney/chutney" ]; then
|
|
|
+ elif [ -d "$TOR_DIR" ] && [ -d "$TOR_DIR/../chutney" ] && \
|
|
|
+ [ -x "$TOR_DIR/../chutney/chutney" ]; then
|
|
|
$ECHO "$myname: \$CHUTNEY_PATH not valid, trying \$TOR_DIR/../chutney"
|
|
|
CHUTNEY_PATH="$TOR_DIR/../chutney"
|
|
|
else
|
|
|
@@ -94,7 +94,7 @@ fi
|
|
|
|
|
|
TEST_NETWORK="$CHUTNEY_PATH/tools/test-network.sh"
|
|
|
# Call the chutney version of this script, if it exists, and we can find it
|
|
|
-if [ -d "$CHUTNEY_PATH" -a -x "$TEST_NETWORK" ]; then
|
|
|
+if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then
|
|
|
$ECHO "$myname: Calling newer chutney script $TEST_NETWORK"
|
|
|
# this may fail if some arguments have spaces in them
|
|
|
# if so, set CHUTNEY_PATH before calling test-network.sh, and spaces
|
rl1987