cleaner code

2 files changed, 4 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 946f22c..52e6a09 100644
--- a/Makefile
+++ b/Makefile
@@ -35,5 +35,5 @@ $(zip):
 $(ver_files): $(img) $(ver)
         $(call sha256_check_file,$(img))
         sudo systemd-run --working-directory $(ver) --wait -P -p PrivateMounts=yes -- \
-                $$PWD/src/extract-efi-boot-files.bash $$PWD/$(img) $(efi_files)
+                $$PWD/src/extract-part1-files.bash $$PWD/$(img) EFI/BOOT $(efi_files)
         $(call sha256_check_file,$@)
diff --git a/src/extract-efi-boot-files.bash b/src/extract-part1-files.bash
index 25a3006..9b8ff1b 100755
--- a/src/extract-efi-boot-files.bash
+++ b/src/extract-part1-files.bash
@@ -5,7 +5,9 @@ set -o pipefail
 image=$1
 [ -e "$image" ]
 shift
-base_dir=EFI/BOOT
+base_dir=$1
+[ "$base_dir" ]
+shift
 source_files=("$@")
 
 get_fsdev()