From 60c99742ce9ff1c675c6e381e17b0f4ccf1a57bd Mon Sep 17 00:00:00 2001
From: WindowsAddict
Date: Thu, 13 Feb 2025 23:10:49 +0530
Subject: 3.0

---
 MAS/Separate-Files-Version/Extract_OEM_Folder.cmd | 208 ++++++++++------------
 1 file changed, 91 insertions(+), 117 deletions(-)

(limited to 'MAS/Separate-Files-Version/Extract_OEM_Folder.cmd')

diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd
index 1577d38..bae7818 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=2.9
+@set masver=3.0
 @echo off
 
 
@@ -122,6 +122,16 @@ call :dk_setvar
 
 ::========================================================================================================================================
 
+if %winbuild% EQU 1 (
+%eline%
+echo Failed to detect Windows build number.
+echo:
+setlocal EnableDelayedExpansion
+set fixes=%fixes% %mas%troubleshoot
+call :dk_color2 %Blue% "Help - " %_Yellow% " %mas%troubleshoot"
+goto dk_done
+)
+
 if %winbuild% LSS 7600 (
 %nceline%
 echo Unsupported OS version detected [%winbuild%].
@@ -246,9 +256,13 @@ set "d4=$k=$t.CreateType(); $b=$k::SetConsoleMode($k::GetStdHandle(-10), 0x0080)
 
 set -=
 set old=
+set upver=%masver:.=%
 
-for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck.mass%-%grave.dev') do (
-if not "%%#"=="" (echo "%%#" | find "127.69" %nul1% && (echo "%%#" | find "127.69.%masver%" %nul1% || set old=1))
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 activ%-%ated.win') do (
+if not "%%#"=="" set old=1
+for /f "delims=[] tokens=2" %%# in ('ping -4 -n 1 updatecheck%upver%.activ%-%ated.win') do (
+if not "%%#"=="" set old=
+)
 )
 
 if defined old (
@@ -264,7 +278,7 @@ echo:
 call :dk_color %_Green% "Choose a menu option using your keyboard [1,0] :"
 choice /C:10 /N
 if !errorlevel!==2 rem
-if !errorlevel!==1 (start ht%-%tps://github.com/mass%-%gravel/Microsoft-Acti%-%vation-Scripts & start %mas% & exit /b)
+if !errorlevel!==1 (start %mas% & exit /b)
 )
 )
 
@@ -305,6 +319,7 @@ 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
 pushd "!_work!"
 
 set _nofile=
@@ -313,6 +328,7 @@ for %%# in (
 %KMS38_Activation.cmd%
 %Online_KMS_Activation.cmd%
 %Ohook_Activation_AIO.cmd%
+%TSforge_Activation.cmd%
 ) do (
 if not exist "%%#" set _nofile=1
 )
@@ -338,36 +354,34 @@ echo:
 echo:
 echo:
 echo:                     Extract $OEM$ folder on the desktop           
-echo:           ________________________________________________________
+echo:         ____________________________________________________________
 echo:
-echo:              [1] HWID
-echo:              [2] Ohook
-echo:              [3] KMS38
-echo:              [4] Online KMS
+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:
-echo:              [5] HWID       ^(Windows^) ^+ Ohook      ^(Office^)
-echo:              [6] HWID       ^(Windows^) ^+ Online KMS ^(Office^)
-echo:              [7] KMS38      ^(Windows^) ^+ Ohook      ^(Office^)
-echo:              [8] KMS38      ^(Windows^) ^+ Online KMS ^(Office^)
-echo:              [9] Online KMS ^(Windows^) ^+ Ohook      ^(Office^)
+echo:            [6] HWID    [Windows] ^+ Ohook [Office]
+echo:            [7] HWID    [Windows] ^+ Ohook [Office] ^+ TSforge [ESU]
+echo:            [8] TSforge [Windows] ^+ Online KMS [Office]
 echo:
-call :dk_color2 %_White% "              [R] " %_Green% "ReadMe"
-echo:              [0] Exit
-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:123456789R0 /N
+choice /C:12345678R0 /N
 set _erl=%errorlevel%
 
-if %_erl%==11 exit /b
-if %_erl%==10 start %mas%oem-folder &goto :Menu
-if %_erl%==9 goto:kms_ohook
-if %_erl%==8 goto:kms38_kms
-if %_erl%==7 goto:kms38_ohook
-if %_erl%==6 goto:hwid_kms
-if %_erl%==5 goto:hwid_ohook
-if %_erl%==4 goto:kms
-if %_erl%==3 goto:kms38
+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%==3 goto:tsforge
 if %_erl%==2 goto:ohook
 if %_erl%==1 goto:hwid
 goto :Menu
@@ -434,6 +448,36 @@ cd \
 
 ::========================================================================================================================================
 
+:tsforge
+
+cls
+md "!desktop!\$OEM$\$$\Setup\Scripts"
+pushd "!_work!"
+copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
+popd
+call :export tsforge_setup
+
+set _error=
+if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
+if not exist "!_dir!\SetupComplete.cmd" set _error=1
+if defined _error goto errorfound
+
+set oem=TSforge
+goto done
+
+:tsforge_setup:
+@echo off
+
+fltmc >nul || exit /b
+
+call "%~dp0TSforge_Activation.cmd" /Z-WindowsESUOffice
+
+cd \
+(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
+:tsforge_setup:
+
+::========================================================================================================================================
+
 :kms38
 
 cls
@@ -532,155 +576,85 @@ cd \
 
 ::========================================================================================================================================
 
-:hwid_kms
+:hwid_ohook_tsforge
 
 cls
 md "!desktop!\$OEM$\$$\Setup\Scripts"
 pushd "!_work!"
 copy /y /b "%HWID_Activation.cmd%" "!_dir!\HWID_Activation.cmd" %nul%
-copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
-popd
-call :export hwid_kms_setup
-
-set _error=
-if not exist "!_dir!\HWID_Activation.cmd" set _error=1
-if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
-if not exist "!_dir!\SetupComplete.cmd" set _error=1
-if defined _error goto errorfound
-
-set oem=HWID [Windows] + Online KMS [Office]
-goto done
-
-:hwid_kms_setup:
-@echo off
-
-fltmc >nul || exit /b
-
-setlocal
-call "%~dp0HWID_Activation.cmd" /HWID
-endlocal
-
-setlocal
-call "%~dp0Online_KMS_Activation.cmd" /K-Office
-endlocal
-
-cd \
-(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:hwid_kms_setup:
-
-::========================================================================================================================================
-
-:kms38_ohook
-
-cls
-md "!desktop!\$OEM$\$$\Setup\Scripts"
-pushd "!_work!"
-copy /y /b "%KMS38_Activation.cmd%" "!_dir!\KMS38_Activation.cmd" %nul%
 copy /y /b "%Ohook_Activation_AIO.cmd%" "!_dir!\Ohook_Activation_AIO.cmd" %nul%
+copy /y /b "%TSforge_Activation.cmd%" "!_dir!\TSforge_Activation.cmd" %nul%
 popd
-call :export kms38_ohook_setup
+call :export hwid_ohook_tsforge_setup
 
 set _error=
-if not exist "!_dir!\KMS38_Activation.cmd" set _error=1
+if not exist "!_dir!\HWID_Activation.cmd" set _error=1
 if not exist "!_dir!\Ohook_Activation_AIO.cmd" set _error=1
+if not exist "!_dir!\TSforge_Activation.cmd" set _error=1
 if not exist "!_dir!\SetupComplete.cmd" set _error=1
 if defined _error goto errorfound
 
-set oem=KMS38 [Windows] + Ohook [Office]
+set oem=HWID [Windows] + Ohook [Office] + TSforge [ESU]
 goto done
 
-:kms38_ohook_setup:
+:hwid_ohook_tsforge_setup:
 @echo off
 
 fltmc >nul || exit /b
 
 setlocal
-call "%~dp0KMS38_Activation.cmd" /KMS38
+call "%~dp0HWID_Activation.cmd" /HWID
 endlocal
 
 setlocal
 call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
 endlocal
 
-cd \
-(goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:kms38_ohook_setup:
-
-::========================================================================================================================================
-
-:kms38_kms
-
-cls
-md "!desktop!\$OEM$\$$\Setup\Scripts"
-pushd "!_work!"
-copy /y /b "%KMS38_Activation.cmd%" "!_dir!\KMS38_Activation.cmd" %nul%
-copy /y /b "%Online_KMS_Activation.cmd%" "!_dir!\Online_KMS_Activation.cmd" %nul%
-popd
-call :export kms38_kms_setup
-
-set _error=
-if not exist "!_dir!\KMS38_Activation.cmd" set _error=1
-if not exist "!_dir!\Online_KMS_Activation.cmd" set _error=1
-if not exist "!_dir!\SetupComplete.cmd" set _error=1
-if defined _error goto errorfound
-
-set oem=KMS38 [Windows] + Online KMS [Office]
-goto done
-
-:kms38_kms_setup:
-@echo off
-
-fltmc >nul || exit /b
-
-setlocal
-call "%~dp0KMS38_Activation.cmd" /KMS38
-endlocal
-
 setlocal
-call "%~dp0Online_KMS_Activation.cmd" /K-Office
+call "%~dp0TSforge_Activation.cmd" /Z-ESU
 endlocal
 
 cd \
 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:kms38_kms_setup:
+:hwid_ohook_tsforge_setup:
 
 ::========================================================================================================================================
 
-:kms_ohook
+:tsforge_kms
 
 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 kms_ohook_setup
+call :export tsforge_kms_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=Online KMS [Windows] + Ohook [Office]
+set oem=TSforge [Windows] + Online KMS [Office]
 goto done
 
-:kms_ohook_setup:
+:tsforge_kms_setup:
 @echo off
 
 fltmc >nul || exit /b
 
 setlocal
-call "%~dp0Online_KMS_Activation.cmd" /K-Windows
+call "%~dp0TSforge_Activation.cmd" /Z-Windows
 endlocal
 
 setlocal
-call "%~dp0Ohook_Activation_AIO.cmd" /Ohook
+call "%~dp0Online_KMS_Activation.cmd" /K-Office
 endlocal
 
 cd \
 (goto) 2>nul & (if "%~dp0"=="%SystemRoot%\Setup\Scripts\" rd /s /q "%~dp0")
-:kms_ohook_setup:
+:tsforge_kms_setup:
 
 ::========================================================================================================================================
 
@@ -698,7 +672,7 @@ 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 To KMS38 activate Server Cor/Acor editions [No GUI Versions],
 echo Check this page %mas%oem-folder
 )
 echo ______________________________________________________________
-- 
cgit v1.2.3