summaryrefslogtreecommitdiff
path: root/scripts/oe-buildenv-internal
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2016-03-15 17:58:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 22:57:59 +0000
commit791eec016792c3f4c04b12ae6ff93c1e23266f87 (patch)
tree2a9631132a58748286bee0646e4eb796155a7ec7 /scripts/oe-buildenv-internal
parent516b63fd9dea6fcc304fca920206467d2565dede (diff)
downloadopenembedded-core-791eec016792c3f4c04b12ae6ff93c1e23266f87.tar.gz
openembedded-core-791eec016792c3f4c04b12ae6ff93c1e23266f87.tar.bz2
openembedded-core-791eec016792c3f4c04b12ae6ff93c1e23266f87.zip
oe-buildenv-internal: Some clean up
* Consistent indentation (four spaces) * Use [ -z ...] and [ -n ... ] where possible * Unset temporary variables * Use $(...) instead of `...` * Avoid an unnecessary call to expr Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'scripts/oe-buildenv-internal')
-rwxr-xr-xscripts/oe-buildenv-internal46
1 files changed, 24 insertions, 22 deletions
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 354501ed4b..bc6a4fedcd 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -24,7 +24,7 @@ if [ -z "$OEROOT" ]; then
return 1
fi
-if [ -z "$OE_SKIP_SDK_CHECK" -a ! -z "$OECORE_SDK_VERSION" ]; then
+if [ -z "$OE_SKIP_SDK_CHECK" ] && [ -n "$OECORE_SDK_VERSION" ]; then
echo >&2 "Error: The OE SDK/ADT was detected as already being present in this shell environment. Please use a clean shell when sourcing this environment script."
return 1
fi
@@ -33,24 +33,26 @@ fi
# sanity.bbclass because bitbake's source code doesn't even pass
# parsing stage when used with python v3, so we catch it here so we
# can offer a meaningful error message.
-py_v3_check=`/usr/bin/env python --version 2>&1 | grep "Python 3"`
-if [ "$py_v3_check" != "" ]; then
- echo >&2 "Bitbake is not compatible with python v3"
- echo >&2 "Please set up python v2 as your default python interpreter"
- return 1
+py_v3_check=$(/usr/bin/env python --version 2>&1 | grep "Python 3")
+if [ -n "$py_v3_check" ]; then
+ echo >&2 "Bitbake is not compatible with python v3"
+ echo >&2 "Please set up python v2 as your default python interpreter"
+ return 1
fi
+unset py_v3_check
# Similarly, we now have code that doesn't parse correctly with older
# versions of Python, and rather than fixing that and being eternally
# vigilant for any other new feature use, just check the version here.
-py_v26_check=`python -c 'import sys; print sys.version_info >= (2,7,3)'`
+py_v26_check=$(python -c 'import sys; print sys.version_info >= (2,7,3)')
if [ "$py_v26_check" != "True" ]; then
- echo >&2 "BitBake requires Python 2.7.3 or later"
- return 1
+ echo >&2 "BitBake requires Python 2.7.3 or later"
+ return 1
fi
+unset py_v26_check
-if [ "x$BDIR" = "x" ]; then
- if [ "x$1" = "x" ]; then
+if [ -z "$BDIR" ]; then
+ if [ -z "$1" ]; then
BDIR="build"
else
BDIR="$1"
@@ -62,34 +64,34 @@ if [ "x$BDIR" = "x" ]; then
# Remove any possible trailing slashes. This is used to work around
# buggy readlink in Ubuntu 10.04 that doesn't ignore trailing slashes
# and hence "readlink -f new_dir_to_be_created/" returns empty.
- BDIR=`echo $BDIR | sed -re 's|/+$||'`
+ BDIR=$(echo $BDIR | sed -re 's|/+$||')
- BDIR=`readlink -f "$BDIR"`
+ BDIR=$(readlink -f "$BDIR")
if [ -z "$BDIR" ]; then
- PARENTDIR=`dirname "$1"`
+ PARENTDIR=$(dirname "$1")
echo >&2 "Error: the directory $PARENTDIR does not exist?"
return 1
fi
fi
- if [ "x$2" != "x" ]; then
+ if [ -n "$2" ]; then
BITBAKEDIR="$2"
fi
fi
-if expr "$BDIR" : '/.*' > /dev/null ; then
+if [ "${BDIR#/}" != "$BDIR" ]; then
BUILDDIR="$BDIR"
else
- BUILDDIR="`pwd`/$BDIR"
+ BUILDDIR="$(pwd)/$BDIR"
fi
unset BDIR
-if [ "x$BITBAKEDIR" = "x" ]; then
- BITBAKEDIR="$OEROOT/bitbake$BBEXTRA/"
+if [ -z "$BITBAKEDIR" ]; then
+ BITBAKEDIR="$OEROOT/bitbake$BBEXTRA"
fi
-BITBAKEDIR=`readlink -f "$BITBAKEDIR"`
-BUILDDIR=`readlink -f "$BUILDDIR"`
+BITBAKEDIR=$(readlink -f "$BITBAKEDIR")
+BUILDDIR=$(readlink -f "$BUILDDIR")
-if ! (test -d "$BITBAKEDIR"); then
+if [ ! -d "$BITBAKEDIR" ]; then
echo >&2 "Error: The bitbake directory ($BITBAKEDIR) does not exist! Please ensure a copy of bitbake exists at this location"
return 1
fi