summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_base.bbclass13
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer13
2 files changed, 18 insertions, 8 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index e5bc0b409d..31e848dd62 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -181,11 +181,16 @@ else
181 echo "$target_sdk_dir" 181 echo "$target_sdk_dir"
182fi 182fi
183 183
184eval target_sdk_dir=$target_sdk_dir 184eval target_sdk_dir=$(printf "%q" "$target_sdk_dir")
185if [ -d $target_sdk_dir ]; then 185if [ -d "$target_sdk_dir" ]; then
186 target_sdk_dir=$(cd $target_sdk_dir; pwd) 186 target_sdk_dir=$(cd "$target_sdk_dir"; pwd)
187else 187else
188 target_sdk_dir=$(readlink -m $target_sdk_dir) 188 target_sdk_dir=$(readlink -m "$target_sdk_dir")
189fi
190
191if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then
192 echo "The target directory path ($target_sdk_dir) contains spaces. Abort!"
193 exit 1
189fi 194fi
190 195
191if [ -e "$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}" ]; then 196if [ -e "$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}" ]; then
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
339 INSTALL_FOLDER=$DEFAULT_INSTALL_FOLDER 339 INSTALL_FOLDER=$DEFAULT_INSTALL_FOLDER
340fi 340fi
341 341
342eval INSTALL_FOLDER=$INSTALL_FOLDER 342eval INSTALL_FOLDER=$(printf "%q" "$INSTALL_FOLDER")
343if [ -d $INSTALL_FOLDER ]; then 343if [ -d "$INSTALL_FOLDER" ]; then
344 export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd) 344 export INSTALL_FOLDER=$(cd "$INSTALL_FOLDER"; pwd)
345else 345else
346 export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER) 346 export INSTALL_FOLDER=$(readlink -m "$INSTALL_FOLDER")
347fi
348
349if [ -n "$(echo $INSTALL_FOLDER|grep ' ')" ]; then
350 echo "The target directory path ($INSTALL_FOLDER) contains spaces. Abort!"
351 exit 1
347fi 352fi
348 353
349clear 354clear