summaryrefslogtreecommitdiff
path: root/support/dependencies
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2014-03-19 00:33:49 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-04-20 11:13:36 +0200
commit38b81eb17253c2590d42243524eed556e80ff58f (patch)
tree6df2e055f19bd1ed749d528b9cd0b36ec6b71a6a /support/dependencies
parenta0df19d2e5efd263c9d23f6df691b7a4cf8dd6f0 (diff)
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: "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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'support/dependencies')
-rwxr-xr-xsupport/dependencies/dependencies.sh12
1 files changed, 8 insertions, 4 deletions
diff --git a/support/dependencies/dependencies.sh b/support/dependencies/dependencies.sh
index a8261b3b0..0566814f8 100755
--- a/support/dependencies/dependencies.sh
+++ b/support/dependencies/dependencies.sh
@@ -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"