From 84ec01c3301c33ec9a61ff03ab0703c653d39180 Mon Sep 17 00:00:00 2001
From: imcaizheng <imcaizheng@gmail.com>
Date: Wed, 31 Aug 2022 02:03:48 +0800
Subject: [PATCH 1/2] export.fish: set IDF_PATH without changing current
 working directory

---
 export.fish | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/export.fish b/export.fish
index b112b61e07..d0ce313dc4 100644
--- a/export.fish
+++ b/export.fish
@@ -6,15 +6,13 @@ function unset
 end
 
 function __main
+    set script_dir (dirname (readlink -m (status -f)))
+
     if not set -q IDF_PATH
-        set -gx IDF_PATH (cd (dirname (status -f)); and pwd)
+        set -gx IDF_PATH $script_dir
         echo "Setting IDF_PATH to '$IDF_PATH'"
     end
 
-    set script_dir (cd (dirname (status -f)); and pwd)
-    if test "$script_dir" = "."
-        set script_dir $pwd
-    end
     if test "$IDF_PATH" != "$script_dir"
         # Change IDF_PATH is important when there are 2 ESP-IDF versions in different directories.
         # Sourcing this script without change, would cause sourcing wrong export script.

From 5974f495b6805300abf557d5d45376a9dbef00c3 Mon Sep 17 00:00:00 2001
From: Marek Fiala <marek.fiala@espressif.com>
Date: Wed, 31 Aug 2022 14:38:24 +0200
Subject: [PATCH 2/2] Fix macOS compatibility

command "readlink -m" was not compatible with macOS.
---
 export.fish | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/export.fish b/export.fish
index d0ce313dc4..755aacf0d1 100644
--- a/export.fish
+++ b/export.fish
@@ -6,8 +6,7 @@ function unset
 end
 
 function __main
-    set script_dir (dirname (readlink -m (status -f)))
-
+    set script_dir (dirname (realpath (status -f)))
     if not set -q IDF_PATH
         set -gx IDF_PATH $script_dir
         echo "Setting IDF_PATH to '$IDF_PATH'"