From 34109c4171ea70eaca1b74d14dcfc84c292f8021 Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Wed, 5 Dec 2018 21:00:36 +0800
Subject: [PATCH] scripts: Fix shell exit. Really exit from current process,
 not from child process

---
 .gitlab-ci.yml                            | 4 ++--
 make/project.mk                           | 4 ++--
 tools/ci/test_configure_ci_environment.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 401d4575b..81d5280be 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -583,9 +583,9 @@ test_esp_err_to_name_on_host:
   script:
     - cd ${IDF_PATH}/tools/
     - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 2.7.15 ./gen_esp_err_to_name.py
-    - git diff --exit-code -- ../components/esp32/esp_err_to_name.c || (echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1)
+    - git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found. Please run gen_esp_err_to_name.py and commit the changes.'; exit 1; }
     - ${IDF_PATH}/tools/ci/multirun_with_pyenv.sh -p 3.4.8 ./gen_esp_err_to_name.py
-    - git diff --exit-code -- ../components/esp32/esp_err_to_name.c || (echo 'Differences found between running under Python 2 and 3.'; exit 1)
+    - git diff --exit-code -- ../components/esp32/esp_err_to_name.c || { echo 'Differences found between running under Python 2 and 3.'; exit 1; }
 
 test_espcoredump:
   <<: *host_test_template
diff --git a/make/project.mk b/make/project.mk
index 31e2e353c..cbd93b346 100644
--- a/make/project.mk
+++ b/make/project.mk
@@ -570,8 +570,8 @@ define GenerateSubmoduleCheckTarget
 check-submodules: $(IDF_PATH)/$(1)/.git
 $(IDF_PATH)/$(1)/.git:
 	@echo "WARNING: Missing submodule $(1)..."
-	[ -e ${IDF_PATH}/.git ] || ( echo "ERROR: esp-idf must be cloned from git to work."; exit 1)
-	[ -x "$(shell which git)" ] || ( echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1)
+	[ -e ${IDF_PATH}/.git ] || { echo "ERROR: esp-idf must be cloned from git to work."; exit 1; }
+	[ -x "$(shell which git)" ] || { echo "ERROR: Need to run 'git submodule init $(1)' in esp-idf root directory."; exit 1; }
 	@echo "Attempting 'git submodule update --init $(1)' in esp-idf root directory..."
 	cd ${IDF_PATH} && git submodule update --init $(1)
 
diff --git a/tools/ci/test_configure_ci_environment.sh b/tools/ci/test_configure_ci_environment.sh
index 2d4caa655..1ad5f430c 100755
--- a/tools/ci/test_configure_ci_environment.sh
+++ b/tools/ci/test_configure_ci_environment.sh
@@ -16,7 +16,7 @@ function assert_branch_public()
         set -e
         source ./configure_ci_environment.sh
         [[ $IS_PUBLIC = $2 ]] || exit 1
-    ) || ( echo "Expected $1 public=$2. Failing" && exit 1 )
+    ) || { echo "Expected $1 public=$2. Failing"; exit 1; }
 }
 
 assert_branch_public master 1