From b25b818a6aa1eba44c6f4c429cb86cf7c554ddc4 Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 1 Sep 2019 14:50:15 +0300
Subject: [PATCH 1/2] kiss: save errored builds to log files

---
 kiss | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/kiss b/kiss
index a3a3249..96aba14 100755
--- a/kiss
+++ b/kiss
@@ -507,10 +507,21 @@ pkg_build() {
         # to avoid collisions with other packages.
         mkdir -p "$pkg_dir/$pkg/$pkg_db"
 
-        # Move to the build directory and call the build script.
+        # Move to the build directory.
         cd "$mak_dir/$pkg"
-        "$repo_dir/build" "$pkg_dir/$pkg" ||
-            die "[$pkg] Build failed"
+
+        # 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" || :> "$pkg-err"; } | tee log
+
+        # If the file exists the build errored, die here and save the log.
+        [ -f "$pkg-err" ] && {
+            cp -f log "$log_dir/$pkg-$date.log"
+
+            die "[$pkg] Build failed" \
+                "[$pkg] Build log saved to '$log_dir/$pkg-$date.log'"
+        }
 
         # Copy the repository files to the package directory.
         # This acts as the database entry.
@@ -1094,6 +1105,9 @@ 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
@@ -1106,6 +1120,7 @@ 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 "$@"

From b340283e262f7b378b7e82c81e9ac66cf1ff34ba Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Sun, 1 Sep 2019 15:02:06 +0300
Subject: [PATCH 2/2] logs: simplify temp files.

---
 kiss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kiss b/kiss
index 96aba14..112bf9e 100755
--- a/kiss
+++ b/kiss
@@ -513,10 +513,10 @@ pkg_build() {
         # 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" || :> "$pkg-err"; } | tee log
+        { "$repo_dir/build" "$pkg_dir/$pkg" || :> err; } | tee log
 
         # If the file exists the build errored, die here and save the log.
-        [ -f "$pkg-err" ] && {
+        [ -f err ] && {
             cp -f log "$log_dir/$pkg-$date.log"
 
             die "[$pkg] Build failed" \