feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

tools/echo and cleanup fix in export scripts

Browse Source 
Signed-off-by: Marek Fiala <marek.fiala@espressif.com>

Closes https://github.com/espressif/esp-idf/pull/5816
This commit is contained in:
Rob Walker
2020-08-31 16:00:57 -07:00
committed by bot
parent 582a39126a
commit 25619bef04
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
export.sh
View File

@@ -1,6 +1,6 @@
# This script should be sourced, not executed. # This script should be sourced, not executed.
realpath_int() { __realpath() {
wdir="$PWD"; [ "$PWD" = "/" ] && wdir="" wdir="$PWD"; [ "$PWD" = "/" ] && wdir=""
arg=$1 arg=$1
case "$arg" in case "$arg" in
@@ -12,7 +12,12 @@ realpath_int() {
} }
idf_export_main() { __verbose() {
[[ -n ${IDF_QUIET} ]] && return
echo "$@"
}
__main() {
# The file doesn't have executable permissions, so this shouldn't really happen. # The file doesn't have executable permissions, so this shouldn't really happen.
# Doing this in case someone tries to chmod +x it and execute... # Doing this in case someone tries to chmod +x it and execute...
@@ -82,15 +87,15 @@ idf_export_main() {
echo "Detecting the Python interpreter" echo "Detecting the Python interpreter"
. "${IDF_PATH}/tools/detect_python.sh" . "${IDF_PATH}/tools/detect_python.sh"
echo "Adding ESP-IDF tools to PATH..." __verbose "Adding ESP-IDF tools to PATH..."
# Call idf_tools.py to export tool paths # Call idf_tools.py to export tool paths
export IDF_TOOLS_EXPORT_CMD=${IDF_PATH}/export.sh export IDF_TOOLS_EXPORT_CMD=${IDF_PATH}/export.sh
export IDF_TOOLS_INSTALL_CMD=${IDF_PATH}/install.sh export IDF_TOOLS_INSTALL_CMD=${IDF_PATH}/install.sh
idf_exports=$("$ESP_PYTHON" "${IDF_PATH}/tools/idf_tools.py" export) || return 1 idf_exports=$("$ESP_PYTHON" "${IDF_PATH}/tools/idf_tools.py" export) || return 1
eval "${idf_exports}" eval "${idf_exports}"
echo "Using Python interpreter in $(which python)" __verbose "Using Python interpreter in $(which python)"
echo "Checking if Python packages are up to date..." __verbose "Checking if Python packages are up to date..."
python "${IDF_PATH}/tools/check_python_dependencies.py" || return 1 python "${IDF_PATH}/tools/check_python_dependencies.py" || return 1
@@ -108,17 +113,17 @@ idf_export_main() {
# shellcheck disable=SC2169,SC2039 # unreachable with 'dash' # shellcheck disable=SC2169,SC2039 # unreachable with 'dash'
paths="${path_prefix//:/ }" paths="${path_prefix//:/ }"
if [ -n "${paths}" ]; then if [ -n "${paths}" ]; then
echo "Added the following directories to PATH:" __verbose "Added the following directories to PATH:"
else else
echo "All paths are already set." __verbose "All paths are already set."
fi fi
for path_entry in ${paths} for path_entry in ${paths}
do do
echo " ${path_entry}" __verbose " ${path_entry}"
done done
else else
echo "Updated PATH variable:" __verbose "Updated PATH variable:"
echo " ${PATH}" __verbose " ${PATH}"
fi fi
# Clean up # Clean up
@@ -133,11 +138,11 @@ idf_export_main() {
# Not unsetting IDF_PYTHON_ENV_PATH, it can be used by IDF build system # Not unsetting IDF_PYTHON_ENV_PATH, it can be used by IDF build system
# to check whether we are using a private Python environment # to check whether we are using a private Python environment
echo "Done! You can now compile ESP-IDF projects." __verbose "Done! You can now compile ESP-IDF projects."
echo "Go to the project directory and run:" __verbose "Go to the project directory and run:"
echo "" __verbose ""
echo " idf.py build" __verbose " idf.py build"
echo "" __verbose ""
} }
enable_autocomplete() { enable_autocomplete() {
@@ -164,9 +169,10 @@ enable_autocomplete() {
} }
idf_export_main __main
enable_autocomplete enable_autocomplete
unset realpath_int unset __realpath
unset idf_export_main unset __main
unset __verbose
unset enable_autocomplete unset enable_autocomplete