build: Explicitly use bash for shell scripts

VPP requires bash for all shell scripts. Align shebang lines in build
and test scripts to look up the location of bash rather than hard coding
'/bin/bash'.

Look up the location of bash for makefiles.

Type: improvement
Change-Id: I23b705d81d60389fa8af61c680cf0abd74f0ea24
Signed-off-by: Tom Jones <thj@freebsd.org>

diff --git a/Makefile b/Makefile
index ccfc2a5..d82a625 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 export WS_ROOT=$(CURDIR)
 export BR=$(WS_ROOT)/build-root
 CCACHE_DIR?=$(BR)/.ccache
-SHELL:=/bin/bash
+SHELL:=$(shell which bash)
 GDB?=gdb
 PLATFORM?=vpp
 SAMPLE_PLUGIN?=no

diff --git a/build-root/Makefile b/build-root/Makefile
index d35b7a1..6416de2 100644 (file)
--- a/build-root/Makefile
+++ b/build-root/Makefile
@@ -39,7 +39,7 @@
 ######################################################################
 
 # Scripts require non-POSIX parts of bash
-SHELL := /bin/bash
+SHELL := $(shell which bash)
 
 # Where this makefile lives
 MU_BUILD_ROOT_DIR = $(shell pwd)
@@ -962,7 +962,7 @@ $(PLATFORM_IMAGE_DIR)/ro.img ro-image: $(patsubst %,%-find-source,$(ROOT_PACKAGE
        chmod 0755 $${tmp_dir} ;                                        \
        cd $${tmp_dir} ;                                                \
        trap "rm -rf $${tmp_dir}" err ;                                 \
-       fakeroot /bin/bash -c "{                                        \
+       fakeroot $(SHELL) -c "{                                 \
          set -eu$(BUILD_DEBUG) ;                                       \
          $(MAKE) -C $(MU_BUILD_ROOT_DIR) IMAGE_INSTALL_DIR=$${tmp_dir} \
            $(patsubst %,%-image_install,                               \
@@ -1054,7 +1054,7 @@ rw-image: rw-image-check-type ro-image
        chmod 0755 $${tmp_dir} ;                                \
        cd $${tmp_dir} ;                                        \
        trap "rm -rf $${tmp_dir}" err ;                         \
-       fakeroot /bin/bash -c "{                                \
+       fakeroot $(SHELL) -c "{                         \
          set -eu$(BUILD_DEBUG) ;                               \
          $(linuxrc_makedev) ;                                  \
          $(call rw_image_embed_ro_image_fn,$${ro_image}) ;     \

diff --git a/build-root/scripts/set-rpath b/build-root/scripts/set-rpath
index f20ff3f..805f11d 100755 (executable)
--- a/build-root/scripts/set-rpath
+++ b/build-root/scripts/set-rpath
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (c) 2015 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/build/external/Makefile b/build/external/Makefile
index 1e1f5da..a445d7b 100644 (file)
--- a/build/external/Makefile
+++ b/build/external/Makefile
@@ -12,7 +12,7 @@
 # limitations under the License.
 
 # Scripts require non-POSIX parts of bash
-SHELL := /bin/bash
+SHELL := $(shell which bash)
 
 DL_CACHE_DIR = $(HOME)/Downloads
 MAKE ?= make

diff --git a/extras/vagrant/build.sh b/extras/vagrant/build.sh
index 0e63947..631b990 100755 (executable)
--- a/extras/vagrant/build.sh
+++ b/extras/vagrant/build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Get Command Line arguements if present
 VPP_DIR=$1

diff --git a/extras/vagrant/clearinterfaces.sh b/extras/vagrant/clearinterfaces.sh
index 31a6309..50b96f0 100755 (executable)
--- a/extras/vagrant/clearinterfaces.sh
+++ b/extras/vagrant/clearinterfaces.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Capture all the interface IPs, in case we need them later
 ip -o addr show > ~vagrant/ifconfiga

diff --git a/extras/vagrant/install.sh b/extras/vagrant/install.sh
index cfe5fe5..67a2e4f 100755 (executable)
--- a/extras/vagrant/install.sh
+++ b/extras/vagrant/install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Get Command Line arguements if present
 VPP_DIR=$1

diff --git a/extras/vagrant/run.sh b/extras/vagrant/run.sh
index 3e87e25..be2d842 100755 (executable)
--- a/extras/vagrant/run.sh
+++ b/extras/vagrant/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Figure out what system we are running on
 if [ "$(uname)" <> "Darwin" ] ; then

diff --git a/extras/vagrant/update.sh b/extras/vagrant/update.sh
index 3fb456b..e56e6ba 100755 (executable)
--- a/extras/vagrant/update.sh
+++ b/extras/vagrant/update.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Make sure that we get the hugepages we need on provision boot
 # Note: The package install should take care of this at the end

diff --git a/extras/vagrant/vcl_test.sh b/extras/vagrant/vcl_test.sh
index 5d58d73..2bad0f6 100755 (executable)
--- a/extras/vagrant/vcl_test.sh
+++ b/extras/vagrant/vcl_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ -n "$1" ]; then
     VPP_DIR=$1

diff --git a/src/scripts/generate_version_h b/src/scripts/generate_version_h
index 5912368..cdcdf5d 100755 (executable)
--- a/src/scripts/generate_version_h
+++ b/src/scripts/generate_version_h
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 : ${VPP_BUILD_USER:=$(whoami)}
 : ${VPP_BUILD_HOST:=$(hostname)}
 DATE_FMT="+%Y-%m-%dT%H:%M:%S"

diff --git a/src/scripts/remove-rpath b/src/scripts/remove-rpath
index 3e20b06..b6df461 100755 (executable)
--- a/src/scripts/remove-rpath
+++ b/src/scripts/remove-rpath
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright (c) 2015 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/src/scripts/vnet/dhcp/left-ping-target.sh b/src/scripts/vnet/dhcp/left-ping-target.sh
index 2edc2a5..4dab842 100644 (file)
--- a/src/scripts/vnet/dhcp/left-ping-target.sh
+++ b/src/scripts/vnet/dhcp/left-ping-target.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # to obtain dhcp address from leftpeer
 dhclient -d -v eth1

diff --git a/test/scripts/compress_failed.sh b/test/scripts/compress_failed.sh
index ff17d24..7e2cd9c 100755 (executable)
--- a/test/scripts/compress_failed.sh
+++ b/test/scripts/compress_failed.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if [ "$(ls -A ${FAILED_DIR})" ]
 then

diff --git a/test/scripts/run.sh b/test/scripts/run.sh
index 51c1c62..504edd6 100755 (executable)
--- a/test/scripts/run.sh
+++ b/test/scripts/run.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ff="0"
 items=

diff --git a/test/scripts/run_in_venv_with_cleanup.sh b/test/scripts/run_in_venv_with_cleanup.sh
index af32f87..3f9d44f 100755 (executable)
--- a/test/scripts/run_in_venv_with_cleanup.sh
+++ b/test/scripts/run_in_venv_with_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 rv=0
 

diff --git a/test/scripts/setsid_wrapper.sh b/test/scripts/setsid_wrapper.sh
index 030c3b0..550c7b9 100755 (executable)
--- a/test/scripts/setsid_wrapper.sh
+++ b/test/scripts/setsid_wrapper.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 cmd=$1
 force_foreground=$2

diff --git a/test/scripts/socket_test.sh b/test/scripts/socket_test.sh
index b94a2f3..3ba739a 100755 (executable)
--- a/test/scripts/socket_test.sh
+++ b/test/scripts/socket_test.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/usr/bin/env bash
 #
 # socket_test.sh -- script to run socket tests.
 #

diff --git a/test/scripts/test-loop.sh b/test/scripts/test-loop.sh
index 51f5d5c..b825f2b 100755 (executable)
--- a/test/scripts/test-loop.sh
+++ b/test/scripts/test-loop.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 function usage() {
  echo "$0" 1>&2