1 files changed, 2 insertions, 4 deletions

diff --git a/src/extract-efi-boot-files.bash b/src/extract-efi-boot-files.bash
index 827c59f..25a3006 100755
--- a/src/extract-efi-boot-files.bash
+++ b/src/extract-efi-boot-files.bash
@@ -23,7 +23,6 @@ get_fsdev()
 
 cleanup()
 {
-    cd "$OLDPWD"
     umount -v /mnt
     dev=$(losetup -j "$image" -nO NAME)
     [ "$dev" ] || exit 0
@@ -34,6 +33,5 @@ cleanup()
 get_fsdev
 mount -v -r "$fsdev" /mnt
 trap cleanup EXIT
-OLDPWD=$PWD
-cd /mnt/"$base_dir"
-cp --no-preserve=mode -t "$OLDPWD" -- "${source_files[@]}"
+source_dir=/mnt/$base_dir
+cp -v --no-preserve=mode -t . -- "${source_files[@]/#/$source_dir/}"