diff options
| author |   Joshua Lock <joshua.lock@collabora.co.uk> | 2015-04-13 16:30:02 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-13 22:29:04 +0100 |
| commit | 0c08723cf5ebc1a7df7dc4ca36cffa090286468c (patch) | |
| tree | c55b866b62e9ab53c5a924f8da1703d4360f27e1 | |
| parent | 682ab52d776d74fb5ede949505f72b4c15ae8191 (diff) | |
| download | openembedded-core-contrib-0c08723cf5ebc1a7df7dc4ca36cffa090286468c.tar.gz | |
oe-init-build-env: fix for build dirs that have spaces in their path
Enclose expansions of BUILDDIR in quotes in order to correctly handle paths
which include spaces.
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | oe-init-build-env | 2 | ||||
| -rwxr-xr-x | scripts/oe-setup-builddir | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oe-init-build-env b/oe-init-build-env index 52495133fd4..6fee5f72a63 100755 --- a/oe-init-build-env +++ b/oe-init-build-env @@ -46,7 +46,7 @@ OEROOT=`readlink -f "$OEROOT"` export OEROOT . $OEROOT/scripts/oe-buildenv-internal && \ $OEROOT/scripts/oe-setup-builddir && \ - [ -n "$BUILDDIR" ] && cd $BUILDDIR + [ -n "$BUILDDIR" ] && cd "$BUILDDIR" unset OEROOT unset BBPATH unset THIS_SCRIPT diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index f73aa3416d5..add0b50e255 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -23,7 +23,7 @@ if [ -z "$BUILDDIR" ]; then exit 1 fi -mkdir -p $BUILDDIR/conf +mkdir -p "$BUILDDIR/conf" if [ ! -d "$BUILDDIR" ]; then echo >&2 "Error: The builddir ($BUILDDIR) does not exist!" @@ -38,13 +38,13 @@ fi cd "$BUILDDIR" if [ -f "$BUILDDIR/conf/templateconf.cfg" ]; then - TEMPLATECONF=$(cat $BUILDDIR/conf/templateconf.cfg) + TEMPLATECONF=$(cat "$BUILDDIR/conf/templateconf.cfg") fi . $OEROOT/.templateconf if [ ! -f "$BUILDDIR/conf/templateconf.cfg" ]; then - echo "$TEMPLATECONF" >$BUILDDIR/conf/templateconf.cfg + echo "$TEMPLATECONF" >"$BUILDDIR/conf/templateconf.cfg" fi # @@ -79,7 +79,7 @@ advantage of multiple cores for example. See the file for more information as common configuration options are commented. EOM - cp -f $OECORELOCALCONF $BUILDDIR/conf/local.conf + cp -f $OECORELOCALCONF "$BUILDDIR/conf/local.conf" SHOWYPDOC=yes fi @@ -100,7 +100,7 @@ EOM # to replace it for compatibility. sed -e "s|##OEROOT##|$OEROOT|g" \ -e "s|##COREBASE##|$OEROOT|g" \ - $OECORELAYERCONF > $BUILDDIR/conf/bblayers.conf + $OECORELAYERCONF > "$BUILDDIR/conf/bblayers.conf" SHOWYPDOC=yes fi |