MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd

@@ -952,7 +952,7 @@ exit /b
 
 for %%# in (%_oIds%) do (
 
-echo: !actiProds%oVer%! | find /i "-%%#-" %nul1% && (
+echo: !actiProds%oVer%! | find /i "%%#" %nul1% && (
 call :dk_color %Gray% "Checking Activation Status              [%%# is already permanently activated]"
 
 ) || (
@@ -1066,7 +1066,6 @@ if not defined actiProds exit /b
 
 for %%# in (%actiProds%) do (
 set _sortIds=%%#
-set _sortIds=!_sortIds:OfficeSPDFreeR_=SPDRetail_!
 set _sortIds=!_sortIds:XC2RVL_=XVolume_!
 set _sortIds=!_sortIds:CO365R_=Retail_!
 set _sortIds=!_sortIds:O365R_=Retail_!
@@ -1076,21 +1075,14 @@ set _sortIds=!_sortIds:DemoR_=Retail_!
 set _sortIds=!_sortIds:EDUR_=Retail_!
 set _sortIds=!_sortIds:R_=Retail_!
 set _sortIds=!_sortIds:VL_=Volume_!
-set _sortIds=!_sortIds:Office16=!
-set _sortIds=!_sortIds:Office19=!
-set _sortIds=!_sortIds:Office21=!
-set _sortIds=!_sortIds:Office24=!
-set _sortIds=!_sortIds:Office=!
-for /f "tokens=1 delims=-_" %%a in ("!_sortIds!") do set "_sortIds=-%%a-"
 set _FsortIds=!_sortIds! !_FsortIds!
 )
 
 call :ohookdata findactivated %2
 exit /b
 
-::  Below IDs are not checked for permanent activation
+::  Preview VL is not checked for permanent activation
 set _sortIds=!_sortIds:PreviewVL_=Volume_!
-set _sortIds=!_sortIds:PreInstallR_=Retail_!
 
 ::========================================================================================================================================
 
@@ -2261,8 +2253,8 @@ if defined _oIds (set _oIds=!_oIds! %%E) else (set _oIds=%%E)
 )
 
 if %1==findactivated if %oVer%==%%A (
-echo "!_FsortIds!" | find /i "-%%E-" %nul% && (
-set actiProds%oVer%=!actiProds%oVer%! -%%E-
+echo "!_FsortIds!" | find /i "%%E" %nul% && (
+set actiProds%oVer%=!actiProds%oVer%! %%E
 )
 )
 

MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd

@@ -984,9 +984,7 @@ for %%# in (%_oIds%) do (
 
 set skipprocess=
 if %_NoEditionChange%==1 if not defined _oBranding (
-set foundprod=
-call :ksdata chkprod %%#
-if not defined foundprod (
+echo %%# | findstr /i "Retail" %nul% && (
 set skipprocess=1
 echo Skipping Because NoEditionChange Mode   [%%#]
 )
@@ -3412,10 +3410,6 @@ if %1==winkey if %osSKU%==%%C if not defined key (
 echo "!allapps!" | find /i "%%A" %nul1% && set key=%%B
 )
 
-if %1==chkprod if "%oVer%"=="%%C" if not defined foundprod (
-echo "%%D" | findstr /I "\<%2.*" %nul% && set foundprod=1
-)
-
 if %1==getinfo if not defined key if "%oVer%"=="%%C" (
 if /i "%2"=="%%D" (
 set key=%%B