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.
This commit is contained in:
Linus Nordberg 2013-06-05 15:48:57 +02:00
parent b567efcfff
commit 538ca4153a

View File

@ -2,10 +2,10 @@
# NOTE: Requires Chutney in $CHUTNEY_PATH. # NOTE: Requires Chutney in $CHUTNEY_PATH.
TOR_DIR=$(/bin/pwd)/src/or TOR_DIR=$(pwd)/src/or
NETWORK_FLAVOUR=basic NETWORK_FLAVOUR=basic
CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
myname=$(/usr/bin/basename $0) myname=$(basename $0)
[ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || { [ -d "$CHUTNEY_PATH" ] && [ -x "$CHUTNEY_PATH/chutney" ] || {
echo "$myname: missing 'chutney' in CHUTNEY_PATH ($CHUTNEY_PATH)" 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 BOOTSTRAP_TIME=18
echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds" echo -n "$myname: sleeping for $BOOTSTRAP_TIME seconds"
n=$BOOTSTRAP_TIME; while [ $n -gt 0 ]; do 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 "" done; echo ""
./chutney verify $CHUTNEY_NETWORK ./chutney verify $CHUTNEY_NETWORK