From 24b214adfe543434d1583d9480285644c08f0568 Mon Sep 17 00:00:00 2001
From: Karsten Hachmeister <karsten@hachmeister.org>
Date: Sun, 3 Jul 2022 18:41:44 +0200
Subject: [PATCH] refactor bootstrap

---
 .config/yadm/bootstrap                 | 13 +++++++++++++
 .config/yadm/bootstrap.d/install-kitty |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.config/yadm/bootstrap b/.config/yadm/bootstrap
index 8955641..331cf4f 100755
--- a/.config/yadm/bootstrap
+++ b/.config/yadm/bootstrap
@@ -6,6 +6,19 @@
 
 set -eu
 
+# Download file and return filename
+function download () {
+    [[ $# == 0 ]] && exit 1
+
+    local url="$1"
+    local suffix="${2:-"${url##*.}"}"
+    local filename="$(mktemp -t "download-XXXXXX.${suffix}")"
+
+    curl --location --output "${filename}" -# "${url}"
+
+    echo "${filename}"
+}
+
 # Directory to look for bootstrap executables in
 BOOTSTRAP_D="${BASH_SOURCE[0]}.d"
 
diff --git a/.config/yadm/bootstrap.d/install-kitty b/.config/yadm/bootstrap.d/install-kitty
index e532c08..2d12aca 100755
--- a/.config/yadm/bootstrap.d/install-kitty
+++ b/.config/yadm/bootstrap.d/install-kitty
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -eu
+
 KITTY_VERSION="0.25.2"
 KITTY_INSTALL_DIR="${HOME}/apps/kitty"
 KITTY_CURRENT_VERSION=""
@@ -12,10 +14,9 @@ if [[ "$KITTY_VERSION" != "$KITTY_CURRENT_VERSION" ]] ; then
   echo "Installing kitty version ${KITTY_VERSION}..."
   
   URL="https://github.com/kovidgoyal/kitty/releases/download/v${KITTY_VERSION}/kitty-${KITTY_VERSION}-x86_64.txz"
-  TARGET="$(mktemp -t kitty-XXXXXX.txz)"
   
   echo "Downloading from ${URL}..."
-  curl --location --output "${TARGET}" -# "${URL}"
+  TARGET="$(download "$URL")"
   
   if [[ -d "${KITTY_INSTALL_DIR}" ]] ; then
     echo "Removing old kitty installation..."