From c7a70b6d0e36491c060a0befe3e5d71042843b90 Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Tue, 21 Mar 2023 16:01:56 +0100
Subject: [PATCH] Tools: don't add the esptool directory with wrappers to the
 PATH

Esptool.py is available from the esptool package which is installed in
every ESP-IDF v5.0+ shells. Therefore, the path to the legacy wrapper
scripts is not needed to be in the PATH. In some cases like
https://github.com/espressif/esp-idf/issues/10926 it even cases problem
because the wrapper doesn't have a shebang line and is not executable.

Note that the wrapper is kept only for invoking esptool as "python
$IDF_PATH/..../esptool.py" which was previously used mostly in CMake
files. There should be no other use-case where the esptool wrappers are
still needed.
---
 export.fish | 1 -
 export.ps1  | 3 +--
 export.sh   | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/export.fish b/export.fish
index 74b8c010a3c..8b391be4b2a 100644
--- 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
index 3ddbe32a0f4..90217fcb937 100644
--- 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
index 89487be2374..ebad0c5e980 100644
--- 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"