MickSlash
/
Microsoft-Activation-Scripts
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: MickSlash:6f88a4bf9021f54678ba944757d327e8ae4f0078
Branches Tags
MickSlash:master
MickSlash:dev
MickSlash:2.8
MickSlash:2.7
MickSlash:2.6
MickSlash:2.5
MickSlash:2.4
MickSlash:2.3
MickSlash:2.2
MickSlash:2.1
MickSlash:2.0
MickSlash:1.9
MickSlash:1.8
MickSlash:1.7
MickSlash:1.6
MickSlash:1.5
MickSlash:1.4
MickSlash:1.3
MickSlash:1.2
..
compare: MickSlash:3d16fc6a07952723cc7528f7b636927666d27659
Branches Tags
MickSlash:master
MickSlash:dev
MickSlash:2.8
MickSlash:2.7
MickSlash:2.6
MickSlash:2.5
MickSlash:2.4
MickSlash:2.3
MickSlash:2.2
MickSlash:2.1
MickSlash:2.0
MickSlash:1.9
MickSlash:1.8
MickSlash:1.7
MickSlash:1.6
MickSlash:1.5
MickSlash:1.4
MickSlash:1.3
MickSlash:1.2

No commits in common. "6f88a4bf9021f54678ba944757d327e8ae4f0078" and "3d16fc6a07952723cc7528f7b636927666d27659" have entirely different histories.
6f88a4bf90 ... 3d16fc6a07

2 changed files with 5 additions and 19 deletions
Show Stats Expand all files Collapse all files

16
MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd
View File

@ -952,7 +952,7 @@ exit /b
for %%# in (%_oIds%) do ( 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]" 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 ( for %%# in (%actiProds%) do (
set _sortIds=%%# set _sortIds=%%#
set _sortIds=!_sortIds:OfficeSPDFreeR_=SPDRetail_!
set _sortIds=!_sortIds:XC2RVL_=XVolume_! set _sortIds=!_sortIds:XC2RVL_=XVolume_!
set _sortIds=!_sortIds:CO365R_=Retail_! set _sortIds=!_sortIds:CO365R_=Retail_!
set _sortIds=!_sortIds:O365R_=Retail_! set _sortIds=!_sortIds:O365R_=Retail_!
@ -1076,21 +1075,14 @@ set _sortIds=!_sortIds:DemoR_=Retail_!
set _sortIds=!_sortIds:EDUR_=Retail_! set _sortIds=!_sortIds:EDUR_=Retail_!
set _sortIds=!_sortIds:R_=Retail_! set _sortIds=!_sortIds:R_=Retail_!
set _sortIds=!_sortIds:VL_=Volume_! 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! set _FsortIds=!_sortIds! !_FsortIds!
) )
call :ohookdata findactivated %2 call :ohookdata findactivated %2
exit /b 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: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 ( if %1==findactivated if %oVer%==%%A (
echo "!_FsortIds!" | find /i "-%%E-" %nul% && ( echo "!_FsortIds!" | find /i "%%E" %nul% && (
set actiProds%oVer%=!actiProds%oVer%! -%%E- set actiProds%oVer%=!actiProds%oVer%! %%E
) )
) )

8
MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd
View File

@ -984,9 +984,7 @@ for %%# in (%_oIds%) do (
set skipprocess= set skipprocess=
if %_NoEditionChange%==1 if not defined _oBranding ( if %_NoEditionChange%==1 if not defined _oBranding (
set foundprod= echo %%# | findstr /i "Retail" %nul% && (
call :ksdata chkprod %%#
if not defined foundprod (
set skipprocess=1 set skipprocess=1
echo Skipping Because NoEditionChange Mode [%%#] 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 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