Commit 38b81eb1 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

support: properly check bash is available 



The current check is broken, as it only checks if the user's login
shell is bash, not what the system shell is.

Mimick the sequence found in the top-level Makefile to search for
bash, except for the fallback case, where we explicitly check that
'sh' is bash, by checking if it sets $BASH, so we know the fallback
case, in the top-level Makefile, to use 'sh' will indeed use bash.

Remove superfluous semi-colons ';' at the end of lines, they are
not needed in a shell script (this is not C!)

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <jacmet@uclibc.org>
Cc: Andrew Barnes <andy@outsideglobe.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a0df19d2

support/dependencies/dependencies.sh

+8 −4
Original line number Diff line number Diff line
@@ -139,11 +139,15 @@ if [ ! -z "$CXXCOMPILER" ] ; then 
fi



# Check bash

if ! $SHELL --version 2>&1 | grep -q '^GNU bash'; then

# We only check bash is available, setting SHELL appropriately is done

# in the top-level Makefile, and we mimick the same sequence here

if   [ -n "${BASH}" ]; then :

elif [ -x /bin/bash ]; then :

elif [ -z "$( sh -c 'echo $BASH' )" ]; then

	echo

	echo "You must install 'bash' on your build machine";

	exit 1;

fi;

	echo "You must install 'bash' on your build machine"

	exit 1

fi



# Check that a few mandatory programs are installed

missing_progs="no"