From df37ee455ae87e47cf2979b11ccf8d98600f9c2e Mon Sep 17 00:00:00 2001
From: Peter Surda <surda@economicsofbitcoin.com>
Date: Tue, 2 Mar 2021 18:56:20 +0100
Subject: [PATCH] fix: download path, typos, cq

---
 install.inc       | 4 ++--
 install.sh        | 2 --
 syslinux-menu.inc | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/install.inc b/install.inc
index a515fad..be8ddb2 100644
--- a/install.inc
+++ b/install.inc
@@ -42,8 +42,8 @@ function download_version()
     fi
 
     mount_efi "$drive"
-    mv boot-init "$mnt"/boot-initrd."$release_version"
-    mv boot-kernel "$mnt"/boot-kernel."$release_version"
+    mv boot-initrd "$mnt"/"$imagepath"/boot-initrd."$release_version"
+    mv boot-kernel "$mnt"/"$imagepath"/boot-kernel."$release_version"
     umount_efi
 
     dev_from_partnum "$drive" "$target"
diff --git a/install.sh b/install.sh
index 65b9a32..1d0f55e 100755
--- a/install.sh
+++ b/install.sh
@@ -15,5 +15,3 @@ get_streams
 get_latest_maas_id
 download_version "$release_version" "$drive"
 update_syslinux_menu "$drive"
-
-
diff --git a/syslinux-menu.inc b/syslinux-menu.inc
index bc8f1e5..9891738 100644
--- a/syslinux-menu.inc
+++ b/syslinux-menu.inc
@@ -2,13 +2,13 @@
 
 . syslinux.inc
 . drive.inc
+imagepath='/os/focal-maas'
 
 function update_syslinux_menu()
 {
     local drive="$1"
     declare -A versions
     declare -a files
-    local imagepath='/os/focal-maas'
 
     files=('boot-kernel.', 'boot-initrd.')
 
@@ -16,6 +16,7 @@ function update_syslinux_menu()
 
     find_newest "$drive"
 
+    > "$mnt"/items.cfg
     if [ -n "$newest" ]; then
         echo "DEFAULT cloud-init-$newest" >> "$mnt"/items.cfg
     fi