aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer
diff options
context:
space:
mode:
authorLaurentiu Palcu <laurentiu.palcu@intel.com>2013-06-25 14:59:05 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-25 17:59:13 +0100
commit8c35ba2d3048ce69f74f72cb2676e4bc162cfb63 (patch)
tree7d8d0366123738c69884c997142b9970e174d379 /meta/recipes-devtools/installer
parent930a48b299c42803fe14185ed31df63c162d3ec6 (diff)
downloadopenembedded-core-contrib-8c35ba2d3048ce69f74f72cb2676e4bc162cfb63.tar.gz
populate_sdk_base, adt_installer: abort install if path contains spaces
Spaces are not handled properly in some parts of oe-core and it's safer to abort toolchain installation if path contains spaces. Even though we fix space handling in the toolchain installation script, there are various other parts in the toolchain (perl scripts, sysroot path passed to toolchain binaries, shebang lines) that would need special handling. So, for now, just bail out if path contains spaces. The checking for spaces in the path is done after expanding relative paths to absolute and tilde conversion. [YOCTO #4488] Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer13
1 files changed, 9 insertions, 4 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index c0123913ef..58728afd63 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -339,11 +339,16 @@ if [ "$INSTALL_FOLDER" = "" ]; then
INSTALL_FOLDER=$DEFAULT_INSTALL_FOLDER
fi
-eval INSTALL_FOLDER=$INSTALL_FOLDER
-if [ -d $INSTALL_FOLDER ]; then
- export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd)
+eval INSTALL_FOLDER=$(printf "%q" "$INSTALL_FOLDER")
+if [ -d "$INSTALL_FOLDER" ]; then
+ export INSTALL_FOLDER=$(cd "$INSTALL_FOLDER"; pwd)
else
- export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER)
+ export INSTALL_FOLDER=$(readlink -m "$INSTALL_FOLDER")
+fi
+
+if [ -n "$(echo $INSTALL_FOLDER|grep ' ')" ]; then
+ echo "The target directory path ($INSTALL_FOLDER) contains spaces. Abort!"
+ exit 1
fi
clear