Extract bootmgfw.efi from both .wim and .esd (customized Win7 ISO)

windows2usb

@@ -155,8 +155,11 @@ function extract_bootmgfw_from_installwim() {
     # $2 - isomountpath
     # $3 - destdir
 
+    local fpath="$2/sources/install.wim"
+    [ ! -a "$fpath" ] && fpath="$2/sources/install.esd"
+
     mount -o ro "$1" "$2"
-    7z e "$2/sources/install.wim" -o"$3/efi/boot/" 1/Windows/Boot/EFI/bootmgfw.efi
+    7z e "$fpath" -o"$3/efi/boot/" '?/Windows/Boot/EFI/bootmgfw.efi'
     umount "$2"
 }