From bc98c788feb7fc924e2ed58903fac1b5a00ff295 Mon Sep 17 00:00:00 2001
From: hedger <hedger@nanode.su>
Date: Tue, 20 Feb 2024 22:32:39 +0000
Subject: [PATCH] fbt: moved FBT_NOEVN check to env setup script for *nix

---
 fbt                         |  5 +----
 scripts/toolchain/fbtenv.sh | 11 +++++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/fbt b/fbt
index e6133d07b..efb031eb2 100755
--- a/fbt
+++ b/fbt
@@ -12,15 +12,12 @@ SCONS_DEFAULT_FLAGS="--warn=target-not-built";
 SCONS_EP="python3 -m SCons";
 
 # public variables
-FBT_NOENV="${FBT_NOENV:-""}";
 FBT_NO_SYNC="${FBT_NO_SYNC:-""}";
 FBT_TOOLCHAIN_PATH="${FBT_TOOLCHAIN_PATH:-$SCRIPT_PATH}";
 FBT_VERBOSE="${FBT_VERBOSE:-""}";
 FBT_GIT_SUBMODULE_SHALLOW="${FBT_GIT_SUBMODULE_SHALLOW:-""}";
 
-if [ -z "$FBT_NOENV" ]; then
-    FBT_VERBOSE="$FBT_VERBOSE" . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
-fi
+FBT_VERBOSE="$FBT_VERBOSE" . "$SCRIPT_PATH/scripts/toolchain/fbtenv.sh";
 
 if [ -z "$FBT_VERBOSE" ]; then
     SCONS_DEFAULT_FLAGS="$SCONS_DEFAULT_FLAGS -Q";
diff --git a/scripts/toolchain/fbtenv.sh b/scripts/toolchain/fbtenv.sh
index e1a9905d6..c7007acdc 100755
--- a/scripts/toolchain/fbtenv.sh
+++ b/scripts/toolchain/fbtenv.sh
@@ -76,6 +76,14 @@ fbtenv_restore_env()
     unset FBT_TOOLCHAIN_PATH;
 }
 
+fbtenv_check_if_noenv_set()
+{
+    if [ -n "${FBT_NOENV:-""}" ]; then
+        return 1;
+    fi
+    return 0;
+}
+
 fbtenv_check_sourced()
 {
     if [ -n "${FBT_SKIP_CHECK_SOURCED:-""}" ]; then
@@ -298,6 +306,9 @@ fbtenv_print_config()
 
 fbtenv_main()
 {
+    if ! fbtenv_check_if_noenv_set; then
+        return 0;
+    fi
     fbtenv_check_sourced || return 1;
     fbtenv_get_kernel_type || return 1;
     if [ "$1" = "--restore" ]; then