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

Merge branch 'bugfix/avoid-exception-messages-while-export_v4.4' into 'release/v4.4'

Browse Source 
Avoid exception messages while autocomplete initialization in export.sh (v4.4)

See merge request espressif/esp-idf!16199
This commit is contained in:
Roland Dobai
2021-11-30 15:48:55 +00:00
parent 376514480d ee881e3f96
commit 3a1e8a9810
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
export.sh
View File

@ -147,6 +147,7 @@ __cleanup() {
unset ESP_PYTHON unset ESP_PYTHON
unset SOURCE_ZSH unset SOURCE_ZSH
unset SOURCE_BASH unset SOURCE_BASH
unset WARNING_MSG
unset __realpath unset __realpath
unset __main unset __main
@ -177,7 +178,9 @@ __enable_autocomplete() {
eval "$(env _IDF.PY_COMPLETE=$SOURCE_ZSH idf.py)" || echo "WARNING: Failed to load shell autocompletion for zsh version: $ZSH_VERSION!" eval "$(env _IDF.PY_COMPLETE=$SOURCE_ZSH idf.py)" || echo "WARNING: Failed to load shell autocompletion for zsh version: $ZSH_VERSION!"
elif [ -n "${BASH_SOURCE-}" ] elif [ -n "${BASH_SOURCE-}" ]
then then
eval "$(env LANG=en _IDF.PY_COMPLETE=$SOURCE_BASH idf.py)" || echo "WARNING: Failed to load shell autocompletion for bash version: $BASH_VERSION!" WARNING_MSG="WARNING: Failed to load shell autocompletion for bash version: $BASH_VERSION!"
[[ ${BASH_VERSINFO[0]} -lt 4 ]] && { echo "$WARNING_MSG"; return; }
eval "$(env LANG=en _IDF.PY_COMPLETE=$SOURCE_BASH idf.py)" || echo "$WARNING_MSG"
fi fi
} }