From e1a5083ea1d4ef61ca850734e067623ea2f623af Mon Sep 17 00:00:00 2001
From: Masayuki Igawa <masayuki@igawa.me>
Date: Tue, 11 Apr 2017 16:24:00 +0900
Subject: [PATCH] Make bash shebangs through /usr/bin/env

This commit makes bash shebangs through /usr/bin/env. The originals work
correctly. However, it could be more flexible through /usr/bin/env. And
we already have a same thing in tools/tox_install.sh. So this commit
makes them consistent, too.

Change-Id: I35a6940cbd95c3b0f0d0f6391584b826e4de2ce5
---
 tools/generate-tempest-plugins-list.sh | 4 +++-
 tools/with_venv.sh                     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/generate-tempest-plugins-list.sh b/tools/generate-tempest-plugins-list.sh
index ecff508c94..e6aad86959 100755
--- a/tools/generate-tempest-plugins-list.sh
+++ b/tools/generate-tempest-plugins-list.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -ex
+#!/usr/bin/env bash
 
 # Copyright 2016 Hewlett Packard Enterprise Development Company, L.P.
 #
@@ -38,6 +38,8 @@
 # current working directory, it will be prepended or appended to
 # the generated reStructuredText plugins table respectively.
 
+set -ex
+
 (
 declare -A plugins
 
diff --git a/tools/with_venv.sh b/tools/with_venv.sh
index 165c883ab9..408b5f1321 100755
--- a/tools/with_venv.sh
+++ b/tools/with_venv.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 TOOLS_PATH=${TOOLS_PATH:-$(dirname $0)/../}
 VENV_PATH=${VENV_PATH:-${TOOLS_PATH}}
 VENV_DIR=${VENV_DIR:-/.venv}