zephyr
/
sdk-ng
mirror of https://github.com/zephyrproject-rtos/sdk-ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity

template_dir: improved help text for toolchain install dir 

This commit reduces number of recommended folders when user is
installing outside any of the default paths.

For example, is user uses a path under /usr/ but not a default search
path, such as /usr/mysdk, then only the /usr/ based recommended paths
are printed.

Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
Torsten Rasmussen 2020-05-12 23:21:42 +02:00 committed by Kumar Gala
parent 098dd433c0
commit ac77d85036
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/template_dir
View File

@ -246,14 +246,25 @@ if [ "$sdk_dirname" != "/opt" \
-a "$sdk_dirname" != "$HOME/bin" ] ||\
[[ "${sdk_basename}" != "zephyr-sdk"* ]]; then
echo
echo "It is recommended to install Zephyr SDK at one of the following locations:"
echo " ${HOME}/zephyr-sdk[-${SDK_VERSION}]"
echo " ${HOME}/.local/zephyr-sdk[-${SDK_VERSION}]"
echo " ${HOME}/.local/opt/zephyr-sdk[-${SDK_VERSION}]"
echo " ${HOME}/bin/zephyr-sdk[-${SDK_VERSION}]"
echo " /opt/zephyr-sdk[-${SDK_VERSION}]"
echo " /usr/zephyr-sdk[-${SDK_VERSION}]"
echo " /usr/local/zephyr-sdk[-${SDK_VERSION}]"
echo "It is recommended to install Zephyr SDK at one of the following locations for automatic discoverability in CMake:"
if [ ${sdk_dirname:0:4} == "/usr" ]; then
echo " /usr/zephyr-sdk-$SDK_VERSION"
echo " /usr/local/zephyr-sdk-$SDK_VERSION"
elif [ ${sdk_dirname:0:4} == "/opt" ]; then
echo " /opt/zephyr-sdk-${SDK_VERSION}"
elif [ ${sdk_dirname:0:$((${#HOME}+7))} == "$HOME/.local" ]; then
echo " ${HOME}/.local/zephyr-sdk-${SDK_VERSION}"
echo " ${HOME}/.local/opt/zephyr-sdk-${SDK_VERSION}"
elif [ ${sdk_dirname:0:${#HOME}} == "$HOME" ]; then
echo " ${HOME}/zephyr-sdk-${SDK_VERSION}"
echo " ${HOME}/bin/zephyr-sdk-${SDK_VERSION}"
else
echo " ${HOME}/zephyr-sdk-${SDK_VERSION}"
echo " /opt/zephyr-sdk-${SDK_VERSION}"
fi
echo
echo Note: The version number \'-$SDK_VERSION\' can be omitted.
echo
read_confirm "installing to ${target_sdk_dir} "