From d8a8eceef43c11b9a84ac6e13ed53154d8573dea Mon Sep 17 00:00:00 2001
From: Marek Fiala <marek.fiala@espressif.com>
Date: Mon, 11 Oct 2021 14:11:09 +0200
Subject: [PATCH] Edited Jen Chitty's commit to keep ESP_IDF consistency

---
 export.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/export.sh b/export.sh
index 3dfdc66997..da23d1f248 100644
--- a/export.sh
+++ b/export.sh
@@ -142,6 +142,8 @@ __cleanup() {
     unset IDF_ADD_PATHS_EXTRAS
     unset idf_exports
     unset ESP_PYTHON
+    unset SOURCE_ZSH
+    unset SOURCE_BASH
 
     unset __realpath
     unset __main
@@ -174,12 +176,7 @@ __enable_autocomplete() {
     then
         eval "$(env LANG=en _IDF.PY_COMPLETE=$SOURCE_BASH idf.py)"  || echo "WARNING: Failed to load shell autocompletion for bash version: $BASH_VERSION!"
     fi
-
-    unset SOURCE_ZSH
-    unset SOURCE_BASH
-
 }
 
-__main
-__enable_autocomplete
+__main && __enable_autocomplete
 __cleanup $?