Invoke binaries in $PATH rather than by absolute path.

That security measure costs more than it gives.
So, keep your PATH sane and we can run this script on more than
one system.

diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index bbf76ede7838e0f5d2ee4ed96798ac16d2acce25..9146ae3ce47415ace49e4b6ab1e88af9ee05e9b2 100755 (executable)
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -2,10 +2,10 @@
 
 # NOTE: Requires Chutney in $CHUTNEY_PATH.
 
-TOR_DIR=$(/bin/pwd)/src/or
+TOR_DIR=$(pwd)/src/or
 NETWORK_FLAVOUR=basic
 CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
-myname=$(/usr/bin/basename $0)
+myname=$(basename $0)
 
 [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || {
     echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)"
@@ -20,6 +20,6 @@ PATH=$TOR_DIR:$PATH             # For picking up the right tor binary.
 BOOTSTRAP_TIME=18
 echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds"
 n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do
-    /bin/sleep 1; n=$(/usr/bin/expr $n - 1); echo -n .
+    sleep 1; n=$(expr $n - 1); echo -n .
 done; echo ""
 ./chutney verify $CHUTNEY_NETWORK