nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-03 00:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update test-network.sh to bash script to use array

Browse Source 
This lets us to save original script argument to array (POSIX shell does not
support that). Fixes shellcheck warnings SC2124 and SC2086.
This commit is contained in:
rl1987 2019-02-02 16:46:30 +02:00
parent 7341d9acdc
commit f888b3e2ee
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/test-network.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
# This script calls the equivalent script in chutney/tools # This script calls the equivalent script in chutney/tools
@ -20,7 +20,7 @@ myname=$(basename $0)
# Save the arguments before we destroy them # Save the arguments before we destroy them
# This might not preserve arguments with spaces in them # This might not preserve arguments with spaces in them
ORIGINAL_ARGS="$@" ORIGINAL_ARGS=( "$@" )
# We need to find CHUTNEY_PATH, so that we can call the version of this script # 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. # in chutney/tools with the same arguments. We also need to respect --quiet.
@ -99,7 +99,7 @@ if [ -d "$CHUTNEY_PATH" ] && [ -x "$TEST_NETWORK" ]; then
# this may fail if some arguments have spaces in them # this may fail if some arguments have spaces in them
# if so, set CHUTNEY_PATH before calling test-network.sh, and spaces # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces
# will be handled correctly # will be handled correctly
exec "$TEST_NETWORK" $ORIGINAL_ARGS exec "$TEST_NETWORK" "${ORIGINAL_ARGS[@]}" # $ORIGINAL_ARGS
else else
$ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH." $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH."
$ECHO "$myname: Please update your chutney using 'git pull'." $ECHO "$myname: Please update your chutney using 'git pull'."