1 files changed, 18 insertions, 25 deletions

diff --git a/Makefile b/Makefile
index 987e707..90331e1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,32 @@
-ver = 3
+version = 3
 efi_files = BOOTX64.EFI
-zip = Super-UEFIinSecureBoot-Disk_v$(ver).zip
-img = $(ver)/Super-UEFIinSecureBoot-Disk.img
-
-ver_files = $(addprefix $(ver)/,$(efi_files))
+zip = _images/Super-UEFIinSecureBoot-Disk_v$(version).zip
+img = _images/$(version)/Super-UEFIinSecureBoot-Disk.img
+sum_file = sha256sum.txt
+extracted_efi_files = $(addprefix $(version)/,$(efi_files))
 
-all: $(ver_files)
+sha256_check_file = grep ' $(1)$$' < $(sum_file) | sha256sum -c
 
+all: $(extracted_efi_files)
 clean:
-        rm -f $(ver_files)
-
+        rm -f $(extracted_efi_files)
+image: $(img)
 view: $(zip)
         unzip -v $^
 
-image: $(img)
-
-$(ver):
+$(version):
         mkdir $@
-
-sum_file = sha256sum.txt
-
-define sha256_check_file
-        grep ' $(1)$$' < $(sum_file) | sha256sum -c
-endef
-
-$(img): | $(zip) $(ver)
+_images/$(version):
+        btrfs subvolume create $@
+$(img): $(zip) | $(dir $(img))
         $(call sha256_check_file,$(zip))
-        unzip -d $(ver) $(zip)
-
+        unzip -d $(dir $@) $<
+        touch $(img)
 $(zip):
-        wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(ver)/$@ -O $@~tmp
+        wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(version)/$@ -O $@~tmp
         mv $@~tmp $@
-
-$(ver_files): $(img) $(ver)
+$(extracted_efi_files): $(img) | $(version)
         $(call sha256_check_file,$(img))
-        sudo systemd-run --working-directory $(ver) --wait -P -p PrivateMounts=yes -- \
+        sudo systemd-run --working-directory $(version) --wait -P -p PrivateMounts=yes -- \
                 $$PWD/src/extract-part1-files.bash $$PWD/$(img) $(addprefix EFI/BOOT/,$(efi_files))
         $(call sha256_check_file,$@)