From f97e7f1c9d9789f5eb349fe911aea4cf968095cb Mon Sep 17 00:00:00 2001
From: Zlobin Vladimir <vladimir.zlobin@intel.com>
Date: Mon, 13 Nov 2023 16:15:30 +0400
Subject: [PATCH] `setupvars.sh`: ignore `cd` output (#20657)

* `setupvars.sh`: ignore `cd` output

Having `function cd() { builtin cd "$@" && l; }` defined in bash breaks `setupvars.sh`

* Use `builtin cd` to enable `function cd() { builtin cd "$@" && l; }`, remove wrapping `echo $()` because `pwd` already prints
---
 scripts/setupvars/setupvars.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/setupvars/setupvars.sh b/scripts/setupvars/setupvars.sh
index bc5d257d68b..88ad3491a5d 100755
--- a/scripts/setupvars/setupvars.sh
+++ b/scripts/setupvars/setupvars.sh
@@ -6,7 +6,8 @@
 abs_path () {
     script_path=$(eval echo "$1")
     directory=$(dirname "$script_path")
-    echo "$(cd "$directory" || exit; pwd -P)";
+    builtin cd "$directory" || exit
+    pwd -P
 }
 
 SCRIPT_DIR="$(abs_path "${BASH_SOURCE[0]}")" >/dev/null 2>&1