From 64177dbb8e7ff9ca9c7ad847c137398f6a67cfcf Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Fri, 26 Apr 2024 08:20:19 +0100 Subject: 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 --- build | 5 ----- include/err.sh | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build b/build index dbcd693..277390f 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 7a6d3fe..d4f8700 100755 --- a/include/err.sh +++ b/include/err.sh @@ -1,6 +1,9 @@ # SPDX-License-Identifier: MIT # SPDX-FileCopyrightText: 2022, 2023 Leah Rowe +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" -- cgit v1.2.1