filetree: Get correct dest efi path "shim/<ver>/EFI/fedora/shim.efi"

 -> "fedora/shim.efi"

Author: HuijingHei

src/filetree.rs

@@ -395,6 +395,15 @@ fn get_first_dir(path: &Utf8Path) -> Result<(Utf8PathBuf, String)> {
     Ok((first.into(), tmp))
 }
 
+/// Get dest efi path "shim/<ver>/EFI/fedora/shim.efi" -> "fedora/shim.efi"
+fn get_dest_efi_path(path: &Utf8Path) -> Utf8PathBuf {
+    let parts: Vec<_> = path.iter().collect();
+    if parts.get(2).map(|c| *c == "EFI").unwrap_or(false) {
+        return parts.iter().skip(3).collect();
+    }
+    path.to_path_buf()
+}
+
 /// Given two directories, apply a diff generated from srcdir to destdir
 #[cfg(any(
     target_arch = "x86_64",
@@ -417,8 +426,8 @@ pub(crate) fn apply_diff(
     // Handle removals in temp dir, or remove directly if file not in dir
     if !opts.skip_removals {
         for pathstr in diff.removals.iter() {
-            let path = Utf8Path::new(pathstr);
-            let (first_dir, first_dir_tmp) = get_first_dir(path)?;
+            let path = get_dest_efi_path(Utf8Path::new(pathstr));
+            let (first_dir, first_dir_tmp) = get_first_dir(&path)?;
             let path_tmp;
             if first_dir != path {
                 path_tmp = Utf8Path::new(&first_dir_tmp).join(path.strip_prefix(&first_dir)?);
@@ -440,8 +449,9 @@ pub(crate) fn apply_diff(
     }
     // Write changed or new files to temp dir or temp file
     for pathstr in diff.changes.iter().chain(diff.additions.iter()) {
-        let path = Utf8Path::new(pathstr);
-        let (first_dir, first_dir_tmp) = get_first_dir(path)?;
+        let src_path = Utf8Path::new(pathstr);
+        let path = get_dest_efi_path(src_path);
+        let (first_dir, first_dir_tmp) = get_first_dir(&path)?;
         let mut path_tmp = Utf8PathBuf::from(&first_dir_tmp);
         if first_dir != path {
             if !destdir.exists(&first_dir_tmp)? && destdir.exists(first_dir.as_std_path())? {
@@ -462,7 +472,7 @@ pub(crate) fn apply_diff(
         }
         updates.insert(first_dir, first_dir_tmp);
         srcdir
-            .copy_file_at(path.as_std_path(), destdir, path_tmp.as_std_path())
+            .copy_file_at(src_path.as_std_path(), destdir, path_tmp.as_std_path())
             .with_context(|| format!("copying {:?} to {:?}", path, path_tmp))?;
     }