kiss: remove logs again!

This commit is contained in:
Dylan Araps 2019-09-02 14:18:05 +03:00
parent dc7edb798c
commit b8da07d770
1 changed files with 2 additions and 16 deletions

18
kiss
View File

@ -502,18 +502,8 @@ pkg_build() {
# Move to the build directory.
cd "$mak_dir/$pkg"
# Call the build script and create a temporary file on error.
# This is the simplest way to mimic "pipefail" in POSIX sh as
# you cannot exit from within a pipe.
{ "$repo_dir/build" "$pkg_dir/$pkg" || :> err; } 2>&1 | tee log
# If the file exists the build errored, die here and save the log.
[ -f err ] && {
cp -f log "$log_dir/$pkg-$date.log"
die "[$pkg] Build failed" \
"[$pkg] Build log saved to '$log_dir/$pkg-$date.log'"
}
# Call the build script.
"$repo_dir/build" "$pkg_dir/$pkg" || die "[$pkg] Build failed"
# Copy the repository files to the package directory.
# This acts as the database entry.
@ -1095,9 +1085,6 @@ main() {
# variable is ever changed.
old_ifs=$IFS
# Store the current date and time for build error logs.
date=$(date +%Y-%m-%d-%H:%M)
# Catch errors and ensure that build files and directories are cleaned
# up before we die. This occurs on 'Ctrl+C' as well as success and error.
trap pkg_clean EXIT INT
@ -1110,7 +1097,6 @@ main() {
"${tar_dir:=$cac_dir/extract-$pid}" \
"${src_dir:=$cac_dir/sources}" \
"${bin_dir:=$cac_dir/bin}" \
"${log_dir:=$cac_dir/logs}" \
|| die "Couldn't create cache directories"
args "$@"