mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-16 13:16:47 +02:00
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>
This commit is contained in:
@@ -7,14 +7,9 @@
|
|||||||
|
|
||||||
set -u -e
|
set -u -e
|
||||||
|
|
||||||
export LC_COLLATE=C
|
|
||||||
export LC_ALL=C
|
|
||||||
|
|
||||||
. "include/err.sh"
|
. "include/err.sh"
|
||||||
. "include/option.sh"
|
. "include/option.sh"
|
||||||
|
|
||||||
export LBMK_RELEASE="$lbmk_release"
|
|
||||||
|
|
||||||
eval "$(setvars "" option aur_notice)"
|
eval "$(setvars "" option aur_notice)"
|
||||||
err="fail"
|
err="fail"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,9 @@
|
|||||||
# SPDX-License-Identifier: MIT
|
# SPDX-License-Identifier: MIT
|
||||||
# SPDX-FileCopyrightText: 2022, 2023 Leah Rowe <leah@libreboot.org>
|
# SPDX-FileCopyrightText: 2022, 2023 Leah Rowe <leah@libreboot.org>
|
||||||
|
|
||||||
|
export LC_COLLATE=C
|
||||||
|
export LC_ALL=C
|
||||||
|
|
||||||
version=""; versiondate=""; projectname=""; _nogit=""
|
version=""; versiondate=""; projectname=""; _nogit=""
|
||||||
err="err_"; tmpdir=""
|
err="err_"; tmpdir=""
|
||||||
|
|
||||||
@@ -10,6 +13,7 @@ lbmk_release=
|
|||||||
set | grep LBMK_RELEASE 1>/dev/null 2>/dev/null || lbmk_release="n" || :
|
set | grep LBMK_RELEASE 1>/dev/null 2>/dev/null || lbmk_release="n" || :
|
||||||
[ -z "$lbmk_release" ] && lbmk_release="$LBMK_RELEASE"
|
[ -z "$lbmk_release" ] && lbmk_release="$LBMK_RELEASE"
|
||||||
[ "$lbmk_release" = "n" ] || [ "$lbmk_release" = "y" ] || lbmk_release="n"
|
[ "$lbmk_release" = "n" ] || [ "$lbmk_release" = "y" ] || lbmk_release="n"
|
||||||
|
export LBMK_RELEASE="$lbmk_release"
|
||||||
|
|
||||||
tmpdir_was_set="y"
|
tmpdir_was_set="y"
|
||||||
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
|
set | grep TMPDIR 1>/dev/null 2>/dev/null || tmpdir_was_set="n"
|
||||||
|
|||||||
Reference in New Issue
Block a user