fixes

1 files changed, 13 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 90331e1..a272c82 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 version = 3
 efi_files = BOOTX64.EFI
-zip = _images/Super-UEFIinSecureBoot-Disk_v$(version).zip
+zipbase = Super-UEFIinSecureBoot-Disk_v$(version).zip
+zip = _images/$(version)/$(zipbase)
+urlbase = https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk
+url = $(urlbase)/releases/download/$(version)/$(notdir $(zip))
 img = _images/$(version)/Super-UEFIinSecureBoot-Disk.img
 sum_file = sha256sum.txt
 extracted_efi_files = $(addprefix $(version)/,$(efi_files))
 
-sha256_check_file = grep ' $(1)$$' < $(sum_file) | sha256sum -c
+sha256_check_file = grep '  $(1)$$' < $(sum_file) | sha256sum -c
 
 all: $(extracted_efi_files)
 clean:
@@ -14,19 +17,20 @@ image: $(img)
 view: $(zip)
         unzip -v $^
 
-$(version):
+_images:
+        systemd-run -tdP -- btrfs subvolume create $@
+        systemd-run -tdP -- chown --reference=$@/.. $@
+$(version) _images/$(version)/: | _images
         mkdir $@
-_images/$(version):
-        btrfs subvolume create $@
 $(img): $(zip) | $(dir $(img))
         $(call sha256_check_file,$(zip))
         unzip -d $(dir $@) $<
-        touch $(img)
-$(zip):
-        wget -c https://github.com/ValdikSS/Super-UEFIinSecureBoot-Disk/releases/download/$(version)/$@ -O $@~tmp
+        touch -c $@
+$(zip): | _images/$(version)
+        wget -c $(url) -O $@~tmp
         mv $@~tmp $@
 $(extracted_efi_files): $(img) | $(version)
         $(call sha256_check_file,$(img))
-        sudo systemd-run --working-directory $(version) --wait -P -p PrivateMounts=yes -- \
+        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,$@)