Browse Source

Use bash rather than the default shell

Closes #21563, related to tor's #21562.
teor 7 years ago
parent
commit
0d57f92157
5 changed files with 7 additions and 6 deletions
  1. 1 1
      chutney
  2. 1 1
      tools/bootstrap-network.sh
  3. 1 1
      tools/hsaddress.sh
  4. 3 2
      tools/test-network.sh
  5. 1 1
      tools/warnings.sh

+ 1 - 1
chutney

@@ -1,4 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
 set -o errexit
 set -o nounset

+ 1 - 1
tools/bootstrap-network.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
 #
 # 1. potentially stop running network
 # 2. bootstrap a network from scratch as quickly as possible

+ 1 - 1
tools/hsaddress.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Usage:
 #    tools/hsaddress.sh [hs_node]

+ 3 - 2
tools/test-network.sh

@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/usr/bin/env bash
 
 ECHO_N="/bin/echo -n"
 
@@ -218,7 +218,8 @@ export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 # And finish up if we're doing a dry run
 if [ "$NETWORK_DRY_RUN" = true ]; then
     # we can't exit here, it breaks argument processing
-    return
+    # this only works in bash: return semantics are shell-specific
+    return 2>/dev/null || exit
 fi
 
 # Chutney must be launched at $CHUTNEY_PATH, at least until #21521 is fixed

+ 1 - 1
tools/warnings.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Usage:
 #    tools/warnings.sh [node]