summaryrefslogtreecommitdiffstats
path: root/meta/files/toolchain-shar-extract.sh
diff options
context:
space:
mode:
Diffstat (limited to 'meta/files/toolchain-shar-extract.sh')
-rw-r--r--meta/files/toolchain-shar-extract.sh16
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh
index 85719fa4ab..27a16074b7 100644
--- a/meta/files/toolchain-shar-extract.sh
+++ b/meta/files/toolchain-shar-extract.sh
@@ -36,7 +36,6 @@ while getopts ":yd:DRS" OPT; do
36 case $OPT in 36 case $OPT in
37 y) 37 y)
38 answer="Y" 38 answer="Y"
39 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
40 ;; 39 ;;
41 d) 40 d)
42 target_sdk_dir=$OPTARG 41 target_sdk_dir=$OPTARG
@@ -73,9 +72,18 @@ fi
73 72
74@SDK_PRE_INSTALL_COMMAND@ 73@SDK_PRE_INSTALL_COMMAND@
75 74
75# SDK_EXTENSIBLE is exposed from the SDK_PRE_INSTALL_COMMAND above
76if [ "$SDK_EXTENSIBLE" = "1" ]; then
77 DEFAULT_INSTALL_DIR="@SDKEXTPATH@"
78fi
79
76if [ "$target_sdk_dir" = "" ]; then 80if [ "$target_sdk_dir" = "" ]; then
77 read -e -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir 81 if [ "$answer" = "Y" ]; then
78 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR 82 target_sdk_dir="$DEFAULT_INSTALL_DIR"
83 else
84 read -e -p "Enter target directory for SDK (default: $DEFAULT_INSTALL_DIR): " target_sdk_dir
85 [ "$target_sdk_dir" = "" ] && target_sdk_dir=$DEFAULT_INSTALL_DIR
86 fi
79fi 87fi
80 88
81eval target_sdk_dir=$(echo "$target_sdk_dir"|sed 's/ /\\ /g') 89eval target_sdk_dir=$(echo "$target_sdk_dir"|sed 's/ /\\ /g')
@@ -155,7 +163,7 @@ echo "done"
155printf "Setting it up..." 163printf "Setting it up..."
156# fix environment paths 164# fix environment paths
157for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do 165for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do
158 $SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script 166 $SUDO_EXEC sed -e "s:@SDKPATH@:$target_sdk_dir:g" -i $env_setup_script
159done 167done
160 168
161@SDK_POST_INSTALL_COMMAND@ 169@SDK_POST_INSTALL_COMMAND@