diff options
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 13 | ||||
| -rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/adt_installer | 13 |
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 echo "$target_sdk_dir" fi -eval target_sdk_dir=$target_sdk_dir -if [ -d $target_sdk_dir ]; then - target_sdk_dir=$(cd $target_sdk_dir; pwd) +eval target_sdk_dir=$(printf "%q" "$target_sdk_dir") +if [ -d "$target_sdk_dir" ]; then + target_sdk_dir=$(cd "$target_sdk_dir"; pwd) else - target_sdk_dir=$(readlink -m $target_sdk_dir) + target_sdk_dir=$(readlink -m "$target_sdk_dir") +fi + +if [ -n "$(echo $target_sdk_dir|grep ' ')" ]; then + echo "The target directory path ($target_sdk_dir) contains spaces. Abort!" + exit 1 fi if [ -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 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 |