Cleanup leftover branding.xml related code

1 files changed, 0 insertions, 15 deletions

diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
index 3330a77..7da980b 100644
--- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
+++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd
@@ -1499,7 +1499,6 @@ set _prids=
 set _config=

 set _version=

 set _License=

-set _oBranding=

 exit /b

 

 ::========================================================================================================================================

@@ -1679,9 +1678,6 @@ set "_common=%CommonProgramFiles%"
 if defined PROCESSOR_ARCHITEW6432 set "_common=%CommonProgramW6432%"

 set "_common2=%CommonProgramFiles(x86)%"

 

-for /r "%_common%\Microsoft Shared\OFFICE%oVer%\" %%f in (BRANDING.XML) do if exist "%%f" set "_oBranding=%%f"

-if not defined _oBranding for /r "%_common2%\Microsoft Shared\OFFICE%oVer%\" %%f in (BRANDING.XML) do if exist "%%f" set "_oBranding=%%f"

-

 if exist "%_common%\Microsoft Shared\OFFICE%oVer%\Office Setup Controller\pkeyconfig-office.xrm-ms" (

 set "pkeypath=%_common%\Microsoft Shared\OFFICE%oVer%\Office Setup Controller\pkeyconfig-office.xrm-ms"

 ) else if exist "%_common2%\Microsoft Shared\OFFICE%oVer%\Office Setup Controller\pkeyconfig-office.xrm-ms" (

@@ -1693,12 +1689,6 @@ call :msiofficedata %2
 echo:

 echo Processing Office...                    [MSI ^| %_version% ^| %_oArch%]

 

-if not defined _oBranding (

-set error=1

-call :dk_color %Red% "Checking BRANDING.XML                   [Not Found. Aborting activation...]"

-exit /b

-)

-

 if not defined _oIds (

 set error=1

 call :dk_color %Red% "Checking Installed Products             [Product IDs not found. Aborting activation...]"

@@ -7195,18 +7185,13 @@ for %%# in (
 ) do (

 for /f "tokens=1-5 delims=_" %%A in ("%%#") do (

 

-set getIds=1

 if "%oVer%"=="%%A" (

-if /i "%2"=="getmsiret" (echo %%D | findstr /i "Volume VL" %nul% && set getIds=)

-

-if defined getIds (

 reg query "%1\Registration\{%%B}" /v ProductCode %nul2% | find /i "-%%C-" %nul% && (

 reg query "%1\Common\InstalledPackages" %nul2% | find /i "-%%C-" %nul% && (

 if defined _oIds (set _oIds=!_oIds! %%D) else (set _oIds=%%D)

 )

 )

 )

-)

 

 )

 )