From dff30f569c4175340a59f86b20a5fd406b12555d Mon Sep 17 00:00:00 2001
From: Dylan Araps <dylan.araps@gmail.com>
Date: Fri, 15 May 2020 09:37:42 +0300
Subject: [PATCH] kiss-chbuild: Fix various issues. Closes #155

---
 contrib/kiss-chbuild | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/contrib/kiss-chbuild b/contrib/kiss-chbuild
index 049add9..6508ed2 100755
--- a/contrib/kiss-chbuild
+++ b/contrib/kiss-chbuild
@@ -5,27 +5,39 @@ log() {
     printf '\033[31;1m->\033[m %s.\n' "$@"
 }
 
+die() {
+    rm -f kiss-chroot.tar.xz kiss-chroot.tar.xz.sha256
+
+    log "$@"
+    log "Re-run 'kiss-chbuild' to try again."
+
+    exit 1
+}
+
 cd "${cac_dir:=$KISS_ROOT${XDG_CACHE_HOME:-$HOME/.cache}/kiss}"
+url=https://github.com/kisslinux/repo/releases/download/1.10.0/
 
 [ -f kiss-chroot.tar.xz ] || {
     log "Downloading chroot tarball"
-
-    url=https://github.com/kisslinux/repo/releases/download/1.10.0/
-    curl -OL "$url/kiss-chroot.tar.xz"
-    curl -OL "$url/kiss-chroot.tar.xz.sha256"
-
-    log "Verifying checksums"
-
-    sha256sum -c < kiss-chroot.tar.xz.sha256 || {
-        rm -f kiss-chroot.tar.xz
-        log "Checksum verification failed."
-        log "Re-run 'kiss-chbuild' to try again."
-    }
+    curl -OL "$url/kiss-chroot.tar.xz" ||
+        die "Failed to download kiss-chroot.tar.xz"
 }
 
+[ -f kiss-chroot.tar.xz.sha256 ] || {
+    log "Downloading checksums"
+    curl -OL "$url/kiss-chroot.tar.xz.sha256" ||
+        die "Failed to download kiss-chroot.tar.xz.sha256"
+}
+
+log "Verifying checksums"
+sha256sum -c < kiss-chroot.tar.xz.sha256 ||
+    die "Checksum verification failed."
+
 [ -d kiss-chroot ] || {
     log "Extracting chroot"
-    tar xf kiss-chroot.tar.xz
+
+    tar xf kiss-chroot.tar.xz ||
+        die "Failed to extract tarball"
 }
 
 log "Creating temporary chroot"