From a29ce481883b83682cfc26b52ad34e2b4a099003 Mon Sep 17 00:00:00 2001
From: "Michael H.G. Schmidt" <michael@schmidt2.de>
Date: Sat, 14 Jan 2023 17:15:31 +0100
Subject: [PATCH] bugfixing

---
 image/CustomSetup.cmd                                 | 2 +-
 optional/{install-iview.cmd => install-irfanview.cmd} | 5 ++---
 optional/install-totalcommander.cmd                   | 2 +-
 scripts/autoconfig-all.cmd                            | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)
 rename optional/{install-iview.cmd => install-irfanview.cmd} (76%)

diff --git a/image/CustomSetup.cmd b/image/CustomSetup.cmd
index a26e205..6370793 100644
--- a/image/CustomSetup.cmd
+++ b/image/CustomSetup.cmd
@@ -2,7 +2,7 @@
 rem this script puts everything in place ...
 
 set TOOLS=c:\tools
-set SXS=c:\sources\sxs
+set SXS=%WINDIR%\sources\sxs
 set BATCH=%TOOLS%\scripts\autoconfig-all.cmd
 set LOG=c:\CustomSetup.txt
 
diff --git a/optional/install-iview.cmd b/optional/install-irfanview.cmd
similarity index 76%
rename from optional/install-iview.cmd
rename to optional/install-irfanview.cmd
index 45a60bd..da5f375 100644
--- a/optional/install-iview.cmd
+++ b/optional/install-irfanview.cmd
@@ -4,11 +4,10 @@ if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\iview-setup.exe
 set STARTMENU="%PROGRAMDATA%\Microsoft\Windows\Start Menu\Programs"
+set TARGET=%PROGRAMFILES%\IrfanView
 
 if NOT EXIST %EXE% (
   echo ERROR: %EXE% not found!
-  echo GOTO: https://www.irfanview.com/64bit.htm
-  echo and save the file as "iview-setup.exe" in folder "software" !
   pause
   exit /b
 )
@@ -16,7 +15,7 @@ if NOT EXIST %EXE% (
 echo ####### %0 #######
 
 echo installing IrfanView ...
-start /wait %EXE% /silent /desktop=1 /thumbs=1 /folder="c:\iview" /group=1 /allusers=1 /assoc=1
+start /wait %EXE% /silent /desktop=1 /thumbs=1 /folder="%TARGET%" /group=1 /allusers=1 /assoc=1
 
 echo removing IrfanView startmenu folder ...
 rd /S /Q %STARTMENU%\"IrfanView" 2>nul
diff --git a/optional/install-totalcommander.cmd b/optional/install-totalcommander.cmd
index d4d5147..411ea9a 100644
--- a/optional/install-totalcommander.cmd
+++ b/optional/install-totalcommander.cmd
@@ -4,7 +4,7 @@ if %ERRORLEVEL% neq 0 exit /b
 
 set EXE=..\software\totalcommander-setup.exe
 set KEY=..\company\wincmd.key
-set TARGET=c:\totalcmd
+set TARGET=%PROGRAMFILES%\totalcommander
 set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
 set STARTMENU_USER=%APPDATA%\"Microsoft\Windows\Start Menu\Programs"
 
diff --git a/scripts/autoconfig-all.cmd b/scripts/autoconfig-all.cmd
index af9317a..130fea1 100644
--- a/scripts/autoconfig-all.cmd
+++ b/scripts/autoconfig-all.cmd
@@ -109,7 +109,7 @@ powershell -Command ^
 echo.
 
 echo enabling OS feature "NetFx3" ...
-dism /online /enable-feature /featurename:NetFx3 /All /Source:c:\sources\sxs /LimitAccess /NoRestart
+dism /online /enable-feature /featurename:NetFx3 /All /Source:%WINDIR%:\sources\sxs /LimitAccess /NoRestart
 echo.
 
 call modify-path.cmd