simplify interface

2 files changed, 3 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 52e6a09..987e707 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-part1-files.bash $$PWD/$(img) EFI/BOOT $(efi_files)
+                $$PWD/src/extract-part1-files.bash $$PWD/$(img) $(addprefix EFI/BOOT/,$(efi_files))
         $(call sha256_check_file,$@)
diff --git a/src/extract-part1-files.bash b/src/extract-part1-files.bash
index 9b8ff1b..9d7c4c4 100755
--- a/src/extract-part1-files.bash
+++ b/src/extract-part1-files.bash
@@ -5,9 +5,6 @@ set -o pipefail
 image=$1
 [ -e "$image" ]
 shift
-base_dir=$1
-[ "$base_dir" ]
-shift
 source_files=("$@")
 
 get_fsdev()
@@ -35,5 +32,5 @@ cleanup()
 get_fsdev
 mount -v -r "$fsdev" /mnt
 trap cleanup EXIT
-source_dir=/mnt/$base_dir
-cp -v --no-preserve=mode -t . -- "${source_files[@]/#/$source_dir/}"
+basedir=/mnt
+cp -v --no-preserve=mode -t . -- "${source_files[@]/#/$basedir/}"