[tor-commits] [tor/master] Revert "Walk back from requiring bash"

[nickm at torproject.org]

commit 4773fa647434eba582f775cb371894b7e36cdb34
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Sun Mar 10 18:16:58 2019 +0200

    Revert "Walk back from requiring bash"
    
    This reverts commit c346eff223e94b5fbeb6e751a99393fc5f7dd4b0.
---
 src/test/test-network.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index 372c8cbac..4d56e8380 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # This script calls the equivalent script in chutney/tools
 
@@ -18,6 +18,10 @@ 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" ]
@@ -95,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" "$@"
+    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'."