20181211

OfficeScrubber/Scrub.cmd

@@ -3,7 +3,7 @@
 set "msg=ERROR: right click on the script and 'Run as administrator'"
 goto :end
 )
-for %%a in (OffScrub_O16msi.vbs,OffScrubC2R.vbs,Remove.xml,setup.exe) do (
+for %%a in (OffScrub_O16msi.vbs,OffScrubC2R.vbs) do (
 if not exist "%~dp0bin\%%a" (set "msg=ERROR: required file %%a is missing"&goto :end)
 )
 for /f "tokens=6 delims=[]. " %%G in ('ver') do set winbuild=%%G
@@ -12,12 +12,20 @@ set "msg=ERROR: Windows 7 SP1 is the minimum supported OS"
 goto :end
 )
 title Office Scrubber
+set xOS=x64
+if /i "%PROCESSOR_ARCHITECTURE%"=="x86" (if "%PROCESSOR_ARCHITEW6432%"=="" set xOS=x86)
 set OfficeC2R=0
 sc query ClickToRunSvc 1>nul 2>nul && set OfficeC2R=1
 sc query OfficeSvc 1>nul 2>nul && set OfficeC2R=1
-reg query HKLM\SOFTWARE\Microsoft\Office\ClickToRun\Configuration /v ProductReleaseIds 1>nul 2>nul && set OfficeC2R=1
+reg query HKLM\SOFTWARE\Microsoft\Office\ClickToRun\Configuration /v ProductReleaseIds 1>nul 2>nul && (
+set OfficeC2R=1
+for /f "tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\ClickToRun\Configuration /v Platform" 2^>nul') do set "plat=%%b"
+)
 reg query HKLM\SOFTWARE\WOW6432Node\Microsoft\Office\ClickToRun\Configuration /v ProductReleaseIds 1>nul 2>nul && set OfficeC2R=1
 if exist "%CommonProgramFiles%\Microsoft Shared\ClickToRun\OfficeClickToRun.exe" set OfficeC2R=1
+if %OfficeC2R% equ 1 if not defined plat (
+if exist "%ProgramFiles(x86)%\Microsoft Office\Office16\OSPP.VBS" (set "plat=x86") else (set "plat=%xOS%")
+)
 set OfficeMSI=0
 for /f "tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Microsoft\Office\16.0\Common\InstallRoot /v Path" 2^>nul') do if exist "%%b\OSPP.VBS" set OfficeMSI=1
 for /f "tokens=2*" %%a in ('"reg query HKLM\SOFTWARE\Wow6432Node\Microsoft\Office\16.0\Common\InstallRoot /v Path" 2^>nul') do if exist "%%b\OSPP.VBS" set OfficeMSI=1
@@ -56,9 +64,9 @@ cd /d "%~dp0bin"
 if exist "%CommonProgramFiles%\Microsoft Shared\ClickToRun\OfficeClickToRun.exe" (
 echo.
 echo ============================================================
-echo Executing ODT setup.exe
+echo Executing OfficeClickToRun.exe
 echo ============================================================
-1>nul 2>nul setup.exe /configure Remove.xml
+1>nul 2>nul start "" /WAIT "%CommonProgramFiles%\Microsoft Shared\ClickToRun\OfficeClickToRun.exe" platform=%plat% productstoremove=AllProducts displaylevel=False
 )
 echo.
 echo ============================================================
@@ -73,6 +81,7 @@ echo ============================================================
 
 reg delete HKCU\Software\Microsoft\Office /f 1>nul 2>nul
 reg delete HKLM\SOFTWARE\Microsoft\Office /f 1>nul 2>nul
+reg delete HKLM\SOFTWARE\Wow6432Node\Microsoft\Office /f 1>nul 2>nul
 for /f %%a in ('"dir /b %windir%\temp\ose*.exe" 2^>nul') do taskkill /t /f /IM %%a 1>nul 2>nul
 del /f /q "%windir%\temp\*" 1>nul 2>nul
 del /f /q "%windir%\temp\*.log" 1>nul 2>nul

W10UI/README.md

@@ -17,28 +17,23 @@ Automated batch script to install/integrate Windows 10 Updates
 - Skip installing Adobe Flash update for Server Core or if the package is removed
 - Handle dynamic updates for setup media 'sources' folder (skip installing it, extract it for distribution target)
 
-* Enable .NET Framework 3.5 if available source detected
-
+* Enable .NET Framework 3.5 if available source detected  
 checked locations: mounted iso, inserted dvd/usb, sxs folder for distribution target
 
 * Detect Windows 10 ADK [Deployment Tools](https://msdn.microsoft.com/en-us/windows/hardware/dn913721.aspx) for offline integration
 
 ## Limitations:
 
-* Updates version will not be checked for applicability
-
-meaning for example, if 10240 updates are specified for 10586 target, the script will proceed to install them
-
+* Updates version will not be checked for applicability  
+meaning for example, if 10240 updates are specified for 10586 target, the script will proceed to install them  
 be sure to specify the correct updates files
 
 * These extra updates are not processed correctly
 
-RSAT: KB2693643
-
+RSAT: KB2693643  
 Media Feature Packs: KB3010081, KB3099229, KB3133719, KB4016817
 
-the script will try to install them whether applicable, already installed or not
-
+the script will try to install them whether applicable, already installed or not  
 avoid using them with the script and install them manually
 
 ## How to:
@@ -57,82 +52,63 @@ avoid using them with the script and install them manually
 
 Press each option corresponding number/letter to change it
 
-1. Target
-
-target windows image, default is current online system
-
+1. Target  
+target windows image, default is current online system  
 if a wim file is available besides the script, it will be detected automatically
 
-2. Updates
-
+2. Updates  
 location of updates files
 
-3. DISM
-
-the path for custom dism.exe
-
+3. DISM  
+the path for custom dism.exe  
 required when the current Host OS is lower than Windows 10 without ADK installed
 
-4. Enable .NET 3.5
-
+4. Enable .NET 3.5  
 process or skip enabling .NET 3.5 feature
 
-5. Cleanup System Image: YES      6. Reset Image Base: NO
-
-in this choice, the OS images will be cleaned and superseded components will be "delta-compressed"
-
+5. Cleanup System Image: YES      6. Reset Image Base: NO  
+in this choice, the OS images will be cleaned and superseded components will be "delta-compressed"  
 safe operation, but might take long time to complete.
 
-5. Cleanup System Image: YES      6. Reset Image Base: YES
-
-in this choice, the OS images will be rebased and superseded components will be "removed"
-
+5. Cleanup System Image: YES      6. Reset Image Base: YES  
+in this choice, the OS images will be rebased and superseded components will be "removed"  
 quick operation and reduce size further more, but might break "Reset this PC" feature.
 
-7. Update WinRE.wim
-
-available only if the target is a distribution folder, or WIM file
-
+7. Update WinRE.wim  
+available only if the target is a distribution folder, or WIM file  
 enable or disable updating winre.wim inside install.wim
 
-M. Mount Directory
-
-mount directory for updating wim files, default is on system drive C:\
+8. Selected Install.wim indexes  
+available only if the target is a distribution folder, or WIM file  
+ability to select specific index(s) to update from install.wim, or all indexes by default
 
+M. Mount Directory  
+mount directory for updating wim files, default is on system drive C:\  
 available only if the target is a distribution folder, or WIM file
 
-E. Extraction Directory
-
+E. Extraction Directory  
 directory for temporary extracted files, default is on the same drive as the script
 
 ## Manual options (for advanced users):
 
 Edit the script with notepad (or text editor) to change
 
-* net35source
-
+* net35source  
 specify custom "folder" path for microsoft-windows-netfx3-ondemand-package.cab
 
-* iso
-
-create new iso file if the target is a distribution folder
-
+* iso  
+create new iso file if the target is a distribution folder  
 require ADK installed, or placing oscdimg.exe or cdimage.exe next to the script
 
-* delete_source
-
+* delete_source  
 keep or delete DVD distribution folder after creating updated ISO
 
-* autostart
-
+* autostart  
 start the process automatically once you execute the script
 
-* you can also change the default value of main Options
-
-examples:
-
-set specific folder as default updates location
-
+* you can also change the default value of main Options  
+examples:  
+set specific folder as default updates location  
 set custom dism.exe path on Windows 8.1
 
 ## Debug Mode (for advanced users):
@@ -149,8 +125,6 @@ set custom dism.exe path on Windows 8.1
 
 ## Credits:
 
-[Creator](https://forums.mydigitallife.net/members/abbodi1406.204274/)
-
-[Concept](https://forums.mydigitallife.net/members/burfadel.84828/)
-
+[Creator](https://forums.mydigitallife.net/members/abbodi1406.204274/)  
+[Concept](https://forums.mydigitallife.net/members/burfadel.84828/)  
 [WHDownloader](https://forums.mydigitallife.net/threads/44645)