From da40e2dc28be8a512ceeedc19824589dbe8e9426 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sun, 28 Mar 2021 11:54:06 +0200
Subject: [PATCH] bugfix

---
 wim/export-image.cmd | 36 ++++++++++++++++++++++--------------
 wim/finish-image.cmd | 37 ++++++++++++++++++++++---------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/wim/export-image.cmd b/wim/export-image.cmd
index f0dd1e1..117cd67 100644
--- a/wim/export-image.cmd
+++ b/wim/export-image.cmd
@@ -5,12 +5,11 @@ set WIM=%SOURCES%\install.wim
 set W10PRO=%SOURCES%\w10pro.wim
 set STATEFILE=%SOURCES%\w10pro.txt
 
-
 if EXIST %STATEFILE% (
 
   echo.
-  echo INFO: found %STATEFILE% 
-  echo nothing todo. all work was already done.
+  echo [%0] INFO: found %STATEFILE% 
+  echo [%0] OK: nothing todo. all work was already done.
   echo READY.
   exit /b
 
@@ -19,12 +18,12 @@ if EXIST %STATEFILE% (
 if EXIST %ESD% (
 
   echo.
-  echo INFO: found %ESD% 
+  echo [%0] INFO: found %ESD% 
 
-  echo deleting "old" install.wim ...
-  del %WIM% 1>nul 2>nul
+  echo [%0] INFO: deleting %WIM% ...
+  del %WIM% 2>nul
 
-  echo exporting image from %ESD% ...
+  echo [%0] INFO: exporting image from %ESD% ...
   dism /Export-Image ^
     /SourceImageFile:%ESD% ^
     /DestinationImageFile:%WIM% ^
@@ -32,22 +31,26 @@ if EXIST %ESD% (
     /Compress:Max ^
     /CheckIntegrity
 
+  if %ERRORLEVEL% NEQ 0 (
+    echo [%0] ERROR: while extracting %ESD%
+    exit /b
+  )
+
   echo.
   echo READY.
   exit /b
 
 )
 
-
 if EXIST %WIM% (
 
   rem cleanup ...
   del /F %W10PRO% 1>nul 2>nul
 
   echo.
-  echo INFO: found %WIM%
+  echo [%0] INFO: found %WIM%
 
-  echo exporting image from %WIM% ...
+  echo [%0] INFO: exporting image from %WIM% ...
   dism /Export-Image ^
     /SourceImageFile:%WIM% ^
     /DestinationImageFile:%W10PRO% ^
@@ -55,9 +58,16 @@ if EXIST %WIM% (
     /Compress:Max ^
     /CheckIntegrity
 
-  echo set write access for install.wim ..
-  attrib -R %WIM%
+  if %ERRORLEVEL% NEQ 0 (
+    echo [%0] ERROR: while extracting %WIM%
+    exit /b
+  )
 
+  echo [%0] WARNING: removing original %WIM% ...
+  attrib -R %WIM% 2>nul
+  del /F %WIM% 1>nul 2>nul
+
+  echo [%0] INFO: renaming %W10PRO% ...
   move /Y %W10PRO% %WIM%
   echo all done >%STATEFILE%
 
@@ -67,5 +77,3 @@ if EXIST %WIM% (
 
 )
 
-set ERRORLEVEL=9009
-
diff --git a/wim/finish-image.cmd b/wim/finish-image.cmd
index 8a79ab6..fbfbb54 100644
--- a/wim/finish-image.cmd
+++ b/wim/finish-image.cmd
@@ -1,43 +1,50 @@
 @echo off
 set SOURCES=c:\TEMP\W10\sources
 set IMAGE=c:\TEMP\IMAGE
+set ESD=%SOURCES%\install.esd
+set WIM=%SOURCES%\install.wim
+set FINAL=%SOURCES%\install_FINAL.esd
 
-if NOT EXIST %SOURCES%\install.wim (
+if NOT EXIST %WIM% (
   echo.
-  echo [%0] ERROR: %SOURCES%\install.wim NOT found!
+  echo [%0] ERROR: %WIM% NOT found!
   exit /b
 )
 
 rd /S /Q %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
 mkdir %IMAGE%\Windows\Setup\scripts 1>nul 2>nul
 
-echo copying scripts to %IMAGE%\Windows\Setup\scripts ...
+echo [%0] INFO: copying scripts to %IMAGE%\Windows\Setup\scripts ...
 copy /Y SetupComplete.cmd %IMAGE%\Windows\Setup\scripts
-if %errorlevel% neq 0 exit /b %errorlevel%
-
 copy /Y StartCustomSetup.cmd %IMAGE%\Windows\Setup\scripts
-if %errorlevel% neq 0 exit /b %errorlevel%
+if %ERRORLEVEL% NEQ 0 (
+  echo [%0] ERROR: while copying scripts to IMAGE
+  exit /b
+)
 
-echo showing directory contents :
+echo [%0] INFO: showing directory contents :
 dir %IMAGE%\Windows\Setup\scripts
 
-echo doing cleanup on mountpoint %IMAGE% ...
+echo [%0] INFO: doing cleanup on mountpoint %IMAGE% ...
 dism /Image:%IMAGE% /Cleanup-Image /StartComponentCleanup /ResetBase
 
-echo unmounting and committing changes to %SOURCES%\install.wim ...
+echo [%0] INFO: unmounting and committing changes to %WIM% ...
 dism /Unmount-Wim /MountDir:%IMAGE% /Commit
 
-echo directory of %IMAGE% :
+echo [%0] INFO: directory of %IMAGE% :
 dir %IMAGE%
 
-echo exporting %SOURCES%\install.wim to %SOURCES%\install_FINAL.esd ...
+echo [%0] INFO: exporting %WIM% to %FINAL% ...
 dism /Export-Image ^
-  /SourceImageFile:%SOURCES%\install.wim ^
-  /DestinationImageFile:%SOURCES%\install_FINAL.esd ^
+  /SourceImageFile:%WIM% ^
+  /DestinationImageFile:%FINAL% ^
   /SourceName:"Windows 10 Pro" ^
   /Compress:Recovery ^
   /CheckIntegrity
 
-echo deleting old %SOURCES%\install.wim
-del /F %SOURCES%\install.wim
+rem delete wim file only in case there is an esd file ...
+if EXIST %ESD% (
+  echo [%0] INFO: deleting %WIM%
+  del /F %SOURCES%\install.wim 2>nul
+)