From c4da3d4d32633a4a27e18cf3e09c8e13e4a544b1 Mon Sep 17 00:00:00 2001 From: Mike Krupicka Date: Thu, 14 Sep 2023 09:20:56 -0500 Subject: [PATCH 1/2] Keep export.sh Bourne Shell compatible --- export.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export.sh b/export.sh index 4ef6ff84d9..e9c83866f5 100644 --- a/export.sh +++ b/export.sh @@ -19,7 +19,7 @@ __verbose() { __script_dir(){ # shellcheck disable=SC2169,SC2169,SC2039,SC3010,SC3028 # unreachable with 'dash' - if [[ "$OSTYPE" == "darwin"* ]]; then + if [ `uname -s` = "Darwin" ]; then # convert possibly relative path to absolute script_dir="$(__realpath "${self_path}")" # resolve any ../ references to make the path shorter From addbc79ee771faa43e962444c961bf4cc289fba1 Mon Sep 17 00:00:00 2001 From: Marek Fiala Date: Tue, 3 Oct 2023 13:35:06 +0200 Subject: [PATCH 2/2] refactor(tools): shellcheck pass modification Closes https://github.com/espressif/esp-idf/pull/12247 --- export.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/export.sh b/export.sh index e9c83866f5..4db5e1b76d 100644 --- a/export.sh +++ b/export.sh @@ -19,7 +19,7 @@ __verbose() { __script_dir(){ # shellcheck disable=SC2169,SC2169,SC2039,SC3010,SC3028 # unreachable with 'dash' - if [ `uname -s` = "Darwin" ]; then + if [ "$(uname -s)" = "Darwin" ]; then # convert possibly relative path to absolute script_dir="$(__realpath "${self_path}")" # resolve any ../ references to make the path shorter