[tor-commits] [tor/maint-0.3.0] Restore support for test-network.sh on BSD and other systems without bash

[nickm@xxxxxxxxxxxxxx]

commit 004ec8dc58078e6f4ab90f603ce3a9df3dd9e065
Author: teor <teor2345@xxxxxxxxx>
Date:   Wed Mar 1 11:21:07 2017 +1100

    Restore support for test-network.sh on BSD and other systems without bash
    
    (But use bash if it's available.)
    This is a workaround until we remove bash-specific code in 19699.
    
    Fixes bug 21581; bugfix on 21562, not in any released version of tor.
---
 changes/bug21581         |  5 +++++
 src/test/test-network.sh | 19 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/changes/bug21581 b/changes/bug21581
new file mode 100644
index 0000000..1077719
--- /dev/null
+++ b/changes/bug21581
@@ -0,0 +1,5 @@
+  o Minor bugfixes (testing):
+    - Restore support for test-network.sh on BSD and other systems without
+      bash. (But use bash if it's available.) This is a workaround until we
+      remove bash-specific code in 19699.
+      Fixes bug 21581; bugfix on 21562, not in any released version of tor.
diff --git a/src/test/test-network.sh b/src/test/test-network.sh
index cb10f72..edd2897 100755
--- a/src/test/test-network.sh
+++ b/src/test/test-network.sh
@@ -1,9 +1,19 @@
-#! /bin/bash
+#! /bin/sh
+
+# use bash if it is available, as this script doesn't work well in non-bash sh
+# this will be fixed in #19699
+# there is no simple, portable way of checking the name of the shell, so we
+# exec bash even when sh is bash
+if [ -x /bin/bash -a "$USING_BASH" != true ]; then
+    # only do this once
+    export USING_BASH=true
+    exec /bin/bash "$0" "$@"
+fi
 
 # Please do not modify this script, it has been moved to chutney/tools
 
-export ECHO=${ECHO:-"echo"}
-export ECHO_N=${ECHO_N:-"/bin/echo -n"}
+export ECHO="${ECHO:-echo}"
+export ECHO_N="${ECHO_N:-/bin/echo -n}"
 
 # Output is prefixed with the name of the script
 myname=$(basename $0)
@@ -21,6 +31,8 @@ if [ "$TEST_NETWORK_RECURSING" != true ]; then
     # can be removed, because this script will find chutney, then pass all
     # arguments to chutney's test-network.sh
     export TEST_NETWORK_RECURSING=true
+    # passing arguments to a sourced script only works in bash
+    # this will be fixed in #19699
     . "$0" --dry-run "$@"
 
     # Call the chutney version of this script, if it exists, and we can find it
@@ -179,6 +191,7 @@ export CHUTNEY_NETWORK=networks/$NETWORK_FLAVOUR
 if [ "$NETWORK_DRY_RUN" = true ]; then
     # we can't exit here, it breaks argument processing
     # this only works in bash: return semantics are shell-specific
+    # this will be fixed in #19699
     return 2>/dev/null || exit
 fi
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits