.

CustomSetup.cmd

@@ -100,7 +100,7 @@ powershell -Command ^
 echo.
 
 rem uninstall some Apps (but keep the store) ...
-powershell uninstall-apps.ps1
+powershell -Command .\uninstall-apps.ps1
 
 echo setting PATH variable (all users) ...
 reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Environment" ^
@@ -111,7 +111,7 @@ reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Session Manager\Env
 
 echo cleanup startmenu ...
 call cleanup-startmenu.cmd
-powershell -Command cleanup-tiles.ps1
+powershell -Command .\cleanup-tiles.ps1
 
 rem install openshell (fuck you microsoft) ...
 call install-openshell.cmd

PrepareStick.cmd

@@ -54,7 +54,7 @@ if EXIST %SOURCES%\install_FINAL.esd (
 
 for %%P in (tools software scripts) do (
   if EXIST %%P (
-    rd /S /Q %USBDRIVE%\%%P
+    rd /S /Q %USBDRIVE%\%%P 1>nul 2>nul
     echo copying folder %%P to drive %USBDRIVE% ...
     robocopy %%P %USBDRIVE%\%%P /MIR /256 /NJH /NFL /NDL
   )

scripts/install-openshell.cmd

@@ -16,7 +16,7 @@ msiexec /i %MSI% ADDLOCAL=StartMenu,ClassicExplorer /passive
 
 rem cleanup ...
 del /Q %MSI% 1>nul 2>nul
-cd %SCRIPTS
+cd %SCRIPTS%
 
 echo ####### %0 #######
 

scripts/uninstall-edge.cmd

@@ -1,12 +1,14 @@
 @echo off
 
 set EDGEROOT="C:\Program Files (x86)\Microsoft\Edge"
+set EDGEUPDATE="C:\Program Files (x86)\Microsoft\EdgeUpdate"
 set INSTALLER=Application\8*\Installer
 
 echo ####### %0 #######
 
 %EDGEROOT%\%INSTALLER%\setup.exe --uninstall --system-level --verbose-logging --force-uninstall
-rd /S /Q %EDGEROOT%
+rd /S /Q %EDGEROOT% 1>nul 2>nul
+rd /S /Q %EDGEUPDATE% 1>nul 2>nul
 
 echo ####### %0 #######