From ba7ed9c4b1137ad76e60a117e061bd3da1be1f61 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 25 Jul 2020 14:19:48 +0200
Subject: Added psfu font downloader

---
 run | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'run')

diff --git a/run b/run
index 506aa4b..63ccc21 100755
--- a/run
+++ b/run
@@ -63,14 +63,23 @@ make_cross() {
 }
 
 make_disk() {
-    rm -rf disk && mkdir -p disk/
-    cd disk/
-
-    wget "https://raw.githubusercontent.com/fcambus/spleen/master/spleen-12x24.bdf" -O font24.bdf
+    rm -rf disk && mkdir -p disk/font/
+
+    cd disk/font/
+    VERSION="1.8.1"
+    wget -q "https://github.com/fcambus/spleen/releases/download/$VERSION/spleen-$VERSION.tar.gz"
+    tar xf "spleen-$VERSION.tar.gz"
+    mv spleen-"$VERSION"/*.psfu .
+    rm -rf "spleen-$VERSION"*
+    cd ../../
 }
 
 make_build() {
-    mkdir -p build/ disk/
+    if ! [ -d "disk/" ]; then
+        make_disk
+    fi
+
+    mkdir -p build/
     rm -rf build/*
 
     echo "Building..."
@@ -88,8 +97,8 @@ make_build() {
 
     mkdir -p mnt/
     sudo mount build/disk.img mnt/
-    sudo cp disk/* mnt/
-    cat disk/* >/dev/null
+    sudo cp -r disk/* mnt/
+    cat disk/**/* >/dev/null
     sudo umount mnt/
     rm -rf mnt/
 
-- 
cgit v1.2.3