1
0
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts.git synced 2024-11-22 14:46:50 +00:00

More accurate check for Office Products in NoEditionChange mode

This commit is contained in:
WindowsAddict 2024-07-17 01:19:06 +05:30
parent dd3d788bfa
commit 6f88a4bf90

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