[tor-commits] [tor/master] Invoke binaries in $PATH rather than by absolute path.

nickm at torproject.org nickm at torproject.org
Sat Jun 29 20:02:23 UTC 2013


commit 538ca4153a1334179856866abf32975caf8daae4
Author: Linus Nordberg <linus at torproject.org>
Date:   Wed Jun 5 15:48:57 2013 +0200

    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.
---
 src/test/test-network.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index bbf76ed..9146ae3 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





More information about the tor-commits mailing list