summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-04-26 08:20:19 +0100
committerLeah Rowe <leah@libreboot.org>2024-04-26 08:20:19 +0100
commit64177dbb8e7ff9ca9c7ad847c137398f6a67cfcf (patch)
tree8e046cbc7b6156bcc7290a9394223a9eb3eac1c6
parenta5082de43cd7fd86491722a7637cf4eec838d6e3 (diff)
exports variables from err.sh, not build
LC_COLLATE and LBMK_RELEASE are important variables. we want to make sure that these are seen by everything. since err.sh is included from all scripts, doing it there will accomplish just that. Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xbuild5
-rwxr-xr-xinclude/err.sh4
2 files changed, 4 insertions, 5 deletions
diff --git a/build b/build
index dbcd6939..277390fd 100755
--- a/build
+++ b/build
@@ -7,14 +7,9 @@
set -u -e
-export LC_COLLATE=C
-export LC_ALL=C
-
. "include/err.sh"
. "include/option.sh"
-export LBMK_RELEASE="$lbmk_release"
-
eval "$(setvars "" option aur_notice)"
err="fail"
diff --git a/include/err.sh b/include/err.sh
index 7a6d3fe5..d4f8700b 100755
--- a/include/err.sh
+++ b/include/err.sh
@@ -1,6 +1,9 @@
# SPDX-License-Identifier: MIT
# SPDX-FileCopyrightText: 2022, 2023 Leah Rowe <leah@libreboot.org>
+export LC_COLLATE=C
+export LC_ALL=C
+
version=""; versiondate=""; projectname=""; _nogit=""
err="err_"; tmpdir=""
@@ -10,6 +13,7 @@ lbmk_release=
set | grep LBMK_RELEASE 1>/dev/null 2>/dev/null || lbmk_release="n" || :
[ -z "$lbmk_release" ] && lbmk_release="$LBMK_RELEASE"
[ "$lbmk_release" = "n" ] || [ "$lbmk_release" = "y" ] || lbmk_release="n"
+export LBMK_RELEASE="$lbmk_release"
tmpdir_was_set="y"
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"