Change one combination for OEM folder

2 files changed, 26 insertions, 25 deletions

diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
index 0689192..94517c9 100644
--- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd
+++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd
@@ -453,6 +453,7 @@ if %winbuild% GEQ 10240 if %winbuild% LEQ 19045 if not defined _serexist if not
 call :dk_color2 %_Green% "       Tip:" %_White% " To activate ESU updates after W10 EOL, use TSforge option."

 )

 echo:

+echo:

 echo:       ______________________________________________________________

 echo:

 echo:                 Activation Methods:

@@ -573,14 +574,14 @@ 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] 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:            [5] HWID    [Windows] ^+ Ohook [Office]

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

-echo:            [7] 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] Go Back

@@ -592,7 +593,7 @@ set _erl=%errorlevel%
 

 if %_erl%==9 goto:Extras

 if %_erl%==8 start %mas%oem-folder &goto:Extract$OEM$2

-if %_erl%==7 (set "_oem=TSforge [Windows] + Online KMS [Office]" & set "para=/Z-Windows /K-Office" &goto:Extract$OEM$3)

+if %_erl%==7 (set "_oem=TSforge [Windows / ESU] + Ohook [Office]" & set "para=/Z-Windows /Z-ESU /Ohook" &goto:Extract$OEM$3)

 if %_erl%==6 (set "_oem=HWID [Windows] + Ohook [Office] + TSforge [ESU]" & set "para=/HWID /Ohook /Z-ESU" &goto:Extract$OEM$3)

 if %_erl%==5 (set "_oem=HWID [Windows] + Ohook [Office]" & set "para=/HWID /Ohook" &goto:Extract$OEM$3)

 if %_erl%==4 (set "_oem=Online KMS" & set "para=/K-WindowsOffice" &goto:Extract$OEM$3)

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index 0b3bd39..1ad1085 100644
--- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
+++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
@@ -444,14 +444,14 @@ 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] 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:            [5] HWID    [Windows] ^+ Ohook [Office]

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

-echo:            [7] 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

@@ -463,7 +463,7 @@ set _erl=%errorlevel%
 

 if %_erl%==9 exit /b

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

-if %_erl%==7 goto:tsforge_kms

+if %_erl%==7 goto:tsforge_ohook

 if %_erl%==6 goto:hwid_ohook_tsforge

 if %_erl%==5 goto:hwid_ohook

 if %_erl%==4 goto:kms

@@ -676,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:

 

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