Merge branch 'bugfix/windows_install_prerequisites' into 'master'

windows_install_prerequisites: Fix generation of PATH command

See merge request idf/esp-idf!3798
This commit is contained in:
Angus Gratton 2018-11-28 09:11:08 +08:00
commit fac12d0dae
2 changed files with 2 additions and 1 deletions

View file

@ -9,6 +9,7 @@
if [ -z ${IDF_PATH} ]; then
echo "IDF_PATH must be set before including this script."
else
IDF_ADD_PATHS_EXTRAS=
IDF_ADD_PATHS_EXTRAS="${IDF_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/esptool_py/esptool"
IDF_ADD_PATHS_EXTRAS="${IDF_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/espcoredump"
IDF_ADD_PATHS_EXTRAS="${IDF_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/partition_table/"

View file

@ -54,7 +54,7 @@ rm ~/${TOOLCHAIN_ZIP}
cat > /etc/profile.d/esp32_toolchain.sh << EOF
# This file was created by ESP-IDF windows_install_prerequisites.sh
# and will be overwritten if that script is run again.
export PATH="\/opt/xtensa-esp32-elf/bin:$PATH"
export PATH="/opt/xtensa-esp32-elf/bin:\$PATH"
EOF
# clean up pacman package cache to save some disk space