Merge branch 'dev'

1 files changed, 24 insertions, 63 deletions

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index e831122..0f87172 100644
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@@ -1,4 +1,4 @@
-@set masver=3.7

+@set masver=3.8

 @echo off

 

 

@@ -406,7 +406,6 @@ goto done2
 )

 

 set HWID_Activation.cmd=Activators\HWID_Activation.cmd

-set KMS38_Activation.cmd=Activators\KMS38_Activation.cmd

 set Online_KMS_Activation.cmd=Activators\Online_KMS_Activation.cmd

 set Ohook_Activation_AIO.cmd=Activators\Ohook_Activation_AIO.cmd

 set TSforge_Activation.cmd=Activators\TSforge_Activation.cmd

@@ -415,7 +414,6 @@ pushd "!_work!"
 set _nofile=

 for %%# in (

 %HWID_Activation.cmd%

-%KMS38_Activation.cmd%

 %Online_KMS_Activation.cmd%

 %Ohook_Activation_AIO.cmd%

 %TSforge_Activation.cmd%

@@ -446,31 +444,29 @@ echo:
 echo:                     Extract $OEM$ folder on the desktop           

 echo:         ____________________________________________________________

 echo:

-echo:            [1] HWID             [Windows]

-echo:            [2] Ohook            [Office]

-echo:            [3] TSforge          [Windows / ESU / Office]

-echo:            [4] KMS38            [Windows]

-echo:            [5] Online KMS       [Windows / Office]

+echo:            [1] HWID       [Windows]

+echo:            [2] Ohook      [Office]

+echo:            [3] TSforge    [Windows / ESU / Office]

+echo:            [4] Online KMS [Windows / Office]

 echo:

-echo:            [6] HWID    [Windows] ^+ Ohook [Office]

-echo:            [7] HWID    [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]

-echo:            [8] TSforge [Windows] ^+ Online KMS [Office]

+echo:            [5] HWID       [Windows] ^+ Ohook [Office]

+echo:            [6] HWID       [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]

+echo:            [7] TSforge    [Windows / ESU] ^+ Ohook [Office]

 echo:

 call :dk_color2 %_White% "            [R] " %_Green% "ReadMe"

 echo:            [0] Exit

 echo:         ____________________________________________________________

 echo:  

 call :dk_color2 %_White% "             " %_Green% "Choose a menu option using your keyboard :"

-choice /C:12345678R0 /N

+choice /C:1234567R0 /N

 set _erl=%errorlevel%

 

-if %_erl%==10 exit /b

-if %_erl%==9 start %mas%oem-folder &goto :Menu

-if %_erl%==8 goto:tsforge_kms

-if %_erl%==7 goto:hwid_ohook_tsforge

-if %_erl%==6 goto:hwid_ohook

-if %_erl%==5 goto:kms

-if %_erl%==4 goto:kms38

+if %_erl%==9 exit /b

+if %_erl%==8 start %mas%oem-folder &goto :Menu

+if %_erl%==7 goto:tsforge_ohook

+if %_erl%==6 goto:hwid_ohook_tsforge

+if %_erl%==5 goto:hwid_ohook

+if %_erl%==4 goto:kms

 if %_erl%==3 goto:tsforge

 if %_erl%==2 goto:ohook

 if %_erl%==1 goto:hwid

@@ -568,36 +564,6 @@ cd \
 

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

 

-:kms38

-

-cls

-md "!desktop!\$OEM$\$$\Setup\Scripts"

-pushd "!_work!"

-copy /y /b "%KMS38_Activation.cmd%" "!_dir!\KMS38_Activation.cmd" %nul%

-popd

-call :export kms38_setup

-

-set _error=

-if not exist "!_dir!\KMS38_Activation.cmd" set _error=1

-if not exist "!_dir!\SetupComplete.cmd" set _error=1

-if defined _error goto errorfound

-

-set oem=KMS38

-goto done

-

-:kms38_setup:

-@echo off

-

-fltmc >nul || exit /b

-

-call "%~dp0KMS38_Activation.cmd" /KMS38

-

-cd \

-(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")

-:kms38_setup:

-

-::========================================================================================================================================

-

 :kms

 

 cls

@@ -710,41 +676,41 @@ cd \
 

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

 

-:tsforge_kms

+:tsforge_ohook

 

 cls

 md "!desktop!\$OEM$\$$\Setup\Scripts"

 pushd "!_work!"

 copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%

-copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%

+copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%

 popd

-call :export tsforge_kms_setup

+call :export tsforge_ohook_setup

 

 set _error=

 if not exist "!_dir!\TSforge_Activation.cmd" set _error=1

-if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1

+if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1

 if not exist "!_dir!\SetupComplete.cmd" set _error=1

 if defined _error goto errorfound

 

-set oem=TSforge [Windows] + Online KMS [Office]

+set oem=TSforge [Windows / ESU] + Ohook [Office]

 goto done

 

-:tsforge_kms_setup:

+:tsforge_ohook_setup:

 @echo off

 

 fltmc >nul || exit /b

 

 setlocal

-call "%~dp0TSforge_Activation.cmd" /Z-Windows

+call "%~dp0TSforge_Activation.cmd" /Z-Windows /Z-ESU

 endlocal

 

 setlocal

-call "%~dp0Online_KMS_Activation.cmd" /K-Office

+call "%~dp0Ohook_Activation_AIO.cmd" /Ohook

 endlocal

 

 cd \

 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")

-:tsforge_kms_setup:

+:tsforge_ohook_setup:

 

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

 

@@ -760,11 +726,6 @@ echo ______________________________________________________________
 echo:

 call :dk_color %Blue% "%oem%"

 call :dk_color %Green% "$OEM$ folder was successfully created on your Desktop."

-echo "%oem%" | find /i "38" %nul% && (

-echo:

-echo To KMS38 activate Server Cor/Acor editions [No GUI Versions],

-echo Check this page %mas%oem-folder

-)

 echo ______________________________________________________________

 

 :done2