aboutsummaryrefslogtreecommitdiff
path: root/src/test/test-network.sh
diff options
context:
space:
mode:
authorLinus Nordberg <linus@torproject.org>2013-06-05 15:48:57 +0200
committerLinus Nordberg <linus@torproject.org>2013-06-18 11:48:02 +0200
commit538ca4153a1334179856866abf32975caf8daae4 (patch)
tree808716980a8f1824fafc77b4a7f42b93f8958892 /src/test/test-network.sh
parentb567efcfff72f8ba5bb9ef2612318bc18f2b4880 (diff)
downloadtor-538ca4153a1334179856866abf32975caf8daae4.tar
tor-538ca4153a1334179856866abf32975caf8daae4.tar.gz
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.
Diffstat (limited to 'src/test/test-network.sh')
-rwxr-xr-xsrc/test/test-network.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index bbf76ede7..9146ae3ce 100755
--- 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