diff options
author | rl1987 <rl1987@sdf.lonestar.org> | 2019-02-21 21:09:40 +0200 |
---|---|---|
committer | rl1987 <rl1987@sdf.lonestar.org> | 2019-02-21 21:09:40 +0200 |
commit | c346eff223e94b5fbeb6e751a99393fc5f7dd4b0 (patch) | |
tree | c73cd0b16244636974d17a2057455a7e7d80f75e /src/test/test-network.sh | |
parent | 4f9061868b04724bf3eaecddf9b536c189bd34da (diff) | |
download | tor-c346eff223e94b5fbeb6e751a99393fc5f7dd4b0.tar.gz tor-c346eff223e94b5fbeb6e751a99393fc5f7dd4b0.zip |
Walk back from requiring bash
Refrain from using bash array to remember $@.
Diffstat (limited to 'src/test/test-network.sh')
-rwxr-xr-x | src/test/test-network.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/test/test-network.sh b/src/test/test-network.sh index 4d56e83806..372c8cbac3 100755 --- a/src/test/test-network.sh +++ b/src/test/test-network.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # This script calls the equivalent script in chutney/tools @@ -18,10 +18,6 @@ ECHO="${ECHO:-echo}" # Output is prefixed with the name of the script myname=$(basename "$0") -# Save the arguments before we destroy them -# This might not preserve arguments with spaces in them -ORIGINAL_ARGS=( "$@" ) - # We need to find CHUTNEY_PATH, so that we can call the version of this script # in chutney/tools with the same arguments. We also need to respect --quiet. until [ -z "$1" ] @@ -99,7 +95,7 @@ if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then # this may fail if some arguments have spaces in them # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces # will be handled correctly - exec "$TEST_NETWORK" "${ORIGINAL_ARGS[@]}" # $ORIGINAL_ARGS + exec "$TEST_NETWORK" "$@" else $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." $ECHO "$myname: Please update your chutney using 'git pull'." |