Merge branch 'contrib/github_pr_11296' into 'master'

Fix references to IDF_ADD_PATHS_EXTRAS before being assigned (GitHub PR) Closes IDFGH-10019 See merge request espressif/esp-idf!23549
espressif · May 4, 2023 · 77f8aa2 · 77f8aa2
2 parents 4ba38c2 + 8097cc9
commit 77f8aa2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/export.fish b/export.fish
@@ -37,7 +37,7 @@ 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_ADD_PATHS_EXTRAS":"$IDF_PATH"/components/espcoredump
+    set 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.sh b/export.sh
@@ -125,7 +125,7 @@ __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_ADD_PATHS_EXTRAS}:${IDF_PATH}/components/espcoredump"
+    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"