From 42131b6250ed5718bc69a80cbd732dee1e2c8db0 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Mon, 13 Apr 2015 16:30:02 +0100 Subject: 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. (From OE-Core rev: 0c08723cf5ebc1a7df7dc4ca36cffa090286468c) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- scripts/oe-setup-builddir | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts/oe-setup-builddir') diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index f73aa3416d..add0b50e25 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 -- cgit v1.2.3-54-g00ecf