Merge branch 'fix/esptool_py_wrapper' into 'master'

Tools: don't add the esptool directory with wrappers to the PATH Closes IDFGH-9577 See merge request espressif/esp-idf!22861
espressif · Mar 22, 2023 · 45bfc25 · 45bfc25
2 parents c71025d + 7473fd3
commit 45bfc25
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/export.fish b/export.fish
@@ -37,7 +37,6 @@ function __main
     set -gx IDF_TOOLS_INSTALL_CMD "$IDF_PATH"/install.fish
     # Allow calling some IDF python tools without specifying the full path
     # "$IDF_PATH"/tools is already added by 'idf_tools.py export'
-    set IDF_ADD_PATHS_EXTRAS "$IDF_PATH"/components/esptool_py/esptool
     set IDF_ADD_PATHS_EXTRAS "$IDF_ADD_PATHS_EXTRAS":"$IDF_PATH"/components/espcoredump
     set IDF_ADD_PATHS_EXTRAS "$IDF_ADD_PATHS_EXTRAS":"$IDF_PATH"/components/partition_table
     set IDF_ADD_PATHS_EXTRAS "$IDF_ADD_PATHS_EXTRAS":"$IDF_PATH"/components/app_update

diff --git a/export.ps1 b/export.ps1
@@ -52,8 +52,7 @@ foreach ($pair  in $envars_array) {
 
 # Allow calling some IDF python tools without specifying the full path
 # ${IDF_PATH}/tools is already added by 'idf_tools.py export'
-$IDF_ADD_PATHS_EXTRAS = [IO.Path]::Combine(${IDF_PATH}, "components", "esptool_py", "esptool")
-$IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "app_update")
+$IDF_ADD_PATHS_EXTRAS = ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "app_update")
 $IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "espcoredump")
 $IDF_ADD_PATHS_EXTRAS += ${S} + [IO.Path]::Combine(${IDF_PATH}, "components", "partition_table")
 $env:PATH = $IDF_ADD_PATHS_EXTRAS + $S + $env:PATH

diff --git a/export.sh b/export.sh
@@ -125,7 +125,6 @@ __main() {
     export IDF_TOOLS_INSTALL_CMD=${IDF_PATH}/install.sh
     # Allow calling some IDF python tools without specifying the full path
     # ${IDF_PATH}/tools is already added by 'idf_tools.py export'
-    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"
     IDF_ADD_PATHS_EXTRAS="${IDF_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/app_update"