Check whether Win 7 bootmgfw.efi exists at all

windows2usb

@@ -178,7 +178,7 @@ function extract_bootmgfw_from_installwim() {
     local fpath="$2/sources/install.wim"
     [ ! -e "$fpath" ] && fpath="$2/sources/install.esd"
 
-    7z e "$fpath" -aoa -o"$3/efi/boot/" '?/Windows/Boot/EFI/bootmgfw.efi'
+    7z e "$fpath" -aoa -o"$3/efi/boot/" 'Windows/Boot/EFI/bootmgfw.efi' '?/Windows/Boot/EFI/bootmgfw.efi'
     umount "$2"
 }
 
@@ -349,8 +349,12 @@ then
         echo "${bold} == Extracting UEFI bootloader from install.wim ==${normal}"
         mkdir -p "$partpath/efi/boot/" || true
         extract_bootmgfw_from_installwim "$isopath" "$isomountpath" "$partpath"
-        mv "$partpath/efi/boot/bootmgfw.efi" "$partpath/efi/boot/bootx64.efi"
-        cp "$partpath/efi/boot/bootx64.efi" "$partpath/efi/boot/bootia32.efi"
+        if [ -e "$partpath/efi/boot/bootmgfw.efi" ]; then
+            mv "$partpath/efi/boot/bootmgfw.efi" "$partpath/efi/boot/bootx64.efi"
+            cp "$partpath/efi/boot/bootx64.efi" "$partpath/efi/boot/bootia32.efi"
+        else
+            echo "NOTE: your ISO file does not have UEFI bootloader, UEFI boot would be unavailable!"
+        fi
     fi
 
     echo "${bold} == Unmounting partition ==${normal}"