From a1377fd282ca862918475e0b9271b4261a912f22 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 13:11:26 +0300 Subject: [PATCH] kiss: fix environment change, old code was.. --- kiss | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/kiss b/kiss index b72ca7b..e470a5a 100755 --- a/kiss +++ b/kiss @@ -805,16 +805,16 @@ pkg_build() { # Call the build script, log the output to the terminal and to a file. # There's no PIPEFAIL in POSIX shell so we must resort to tricks like kill. { - set -a - # Give the script a modified environment. Define CC and CXX giving them # the generic values cc and c++. Define KISS_ROOT sanitized to ensure # safe path joining in build files. + # + # shellcheck disable=2034 CC="${CC:-cc}" \ CXX="${CXX:-c++}" \ DESTDIR="$pkg_dir/$1" \ KISS_ROOT="$KISS_ROOT" \ - + \ "$repo_dir/build" "$pkg_dir/$1" "$repo_ver" 2>&1 || { log "$1" "Build failed" log "$1" "Log stored to $log_dir/$1-$time-$pid" @@ -822,8 +822,6 @@ pkg_build() { pkg_clean kill 0 } - - set +a } | tee "$log_dir/$1-$time-$pid" # Delete the log file if the build succeeded to prevent the directory