[tor-commits] [tor/master] Update test-network.sh to bash script to use array

[nickm at torproject.org]

commit f888b3e2ee23f6e0394c9c7589c10e320714deda
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Sat Feb 2 16:46:30 2019 +0200

    Update test-network.sh to bash script to use array
    
    This lets us to save original script argument to array (POSIX shell does not
    support that). Fixes shellcheck warnings SC2124 and SC2086.
---
 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 51b298ca8..e382eec66 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # This script calls the equivalent script in chutney/tools
 
@@ -20,7 +20,7 @@ myname=$(basename $0)
 
 # Save the arguments before we destroy 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
 # 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
     # if so, set CHUTNEY_PATH before calling test-network.sh, and spaces
     # will be handled correctly
-    exec "$TEST_NETWORK" $ORIGINAL_ARGS
+    exec "$TEST_NETWORK" "${ORIGINAL_ARGS[@]}" # $ORIGINAL_ARGS
 else
     $ECHO "$myname: Could not find tools/test-network.sh in CHUTNEY_PATH."
     $ECHO "$myname: Please update your chutney using 'git pull'."