Fascinated/Microsoft-Activation-Scripts
1
0
Fork 0
mirror of https://github.com/massgravel/Microsoft-Activation-Scripts.git synced 2024-11-27 00:16:51 +00:00
Code

Compare commits

base: Fascinated:6efb5d50fec167b3bf09d0122840c67c74508de8
Branches Tags
Fascinated:master
Fascinated:dev
Fascinated:2.8
Fascinated:2.7
Fascinated:2.6
Fascinated:2.5
Fascinated:2.4
Fascinated:2.3
Fascinated:2.2
Fascinated:2.1
Fascinated:2.0
Fascinated:1.9
Fascinated:1.8
Fascinated:1.7
Fascinated:1.6
Fascinated:1.5
Fascinated:1.4
Fascinated:1.3
Fascinated:1.2
..
compare: Fascinated:d384c5f2f79f12f8d4aa18797452e8839cb99cf3
Branches Tags
Fascinated:master
Fascinated:dev
Fascinated:2.8
Fascinated:2.7
Fascinated:2.6
Fascinated:2.5
Fascinated:2.4
Fascinated:2.3
Fascinated:2.2
Fascinated:2.1
Fascinated:2.0
Fascinated:1.9
Fascinated:1.8
Fascinated:1.7
Fascinated:1.6
Fascinated:1.5
Fascinated:1.4
Fascinated:1.3
Fascinated:1.2

No commits in common. "6efb5d50fec167b3bf09d0122840c67c74508de8" and "d384c5f2f79f12f8d4aa18797452e8839cb99cf3" have entirely different histories.
6efb5d50fe ... d384c5f2f7

8 changed files with 66 additions and 230 deletions
Show Stats Expand all files Collapse all files

144
MAS/All-In-One-Version-KL/MAS_AIO.cmd
View File

@ -1583,11 +1583,7 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" ( if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && ( sc query wlms | find /i "RUNNING" %nul% && (
if %winbuild% LSS 9200 (
echo Checking Eval WLMS Service [Found] echo Checking Eval WLMS Service [Found]
) else (
call :dk_color %Red% "Checking Eval WLMS Service [Found]"
)
) )
) )
@ -2056,7 +2052,7 @@ cls
if not defined terminal ( if not defined terminal (
mode 130, 32 mode 130, 32
if exist "%SysPath%\spp\store_test\" mode 134, 32 if exist "%SysPath%\spp\store_test\" mode 134, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Ohook Activation %masver% title Ohook Activation %masver%
@ -4435,7 +4431,7 @@ cls
if not defined terminal ( if not defined terminal (
mode 115, 32 mode 115, 32
if exist "%SysPath%\spp\store_test\" mode 135, 32 if exist "%SysPath%\spp\store_test\" mode 135, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Online %KS% Activation %masver% title Online %KS% Activation %masver%
@ -6402,8 +6398,8 @@ exit /b
cls cls
if not defined terminal ( if not defined terminal (
mode 100, 36 mode 100, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=35;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
%psc% "$f=[IO.File]::ReadAllText('!_batp!') -split ':sppmgr\:.*';iex ($f[1])" %psc% "$f=[IO.File]::ReadAllText('!_batp!') -split ':sppmgr\:.*';iex ($f[1])"
@ -7583,7 +7579,7 @@ goto :at_back
cls cls
if not defined terminal ( if not defined terminal (
mode 125, 32 mode 125, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Fix Licensing ^(ClipSVC ^+ SPP ^+ OSPP^) title Fix Licensing ^(ClipSVC ^+ SPP ^+ OSPP^)
@ -8796,7 +8792,7 @@ goto dk_done
cls cls
if not defined terminal ( if not defined terminal (
mode con cols=105 lines=32 mode con cols=105 lines=32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
call :ced_rebootflag call :ced_rebootflag
@ -8833,7 +8829,7 @@ goto dk_done
cls cls
if not defined terminal ( if not defined terminal (
mode con cols=105 lines=32 mode con cols=105 lines=32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
set key= set key=
@ -9470,23 +9466,20 @@ echo:
echo: echo:
echo ____________________________________________________________ echo ____________________________________________________________
echo: echo:
echo [1] Change all editions echo [1] Change - Office Edition
echo [2] Add edition echo [2] Add - Office Edition
echo [3] Remove edition echo [3] Remove - Office Edition
echo:
echo [4] Add/Remove apps
echo ____________________________________________ echo ____________________________________________
echo: echo:
echo [5] Change Office Update Channel echo [4] Change Office Update Channel
echo [0] %_exitmsg% echo [0] %_exitmsg%
echo ____________________________________________________________ echo ____________________________________________________________
echo: echo:
call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard [1,2,3,4,5,0]" call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard [1,2,3,4,0]"
choice /C:123450 /N choice /C:12340 /N
set _el=!errorlevel! set _el=!errorlevel!
if !_el!==6 exit /b if !_el!==5 exit /b
if !_el!==5 goto :oe_changeupdchnl if !_el!==4 goto :oe_changeupdchnl
if !_el!==4 goto :oe_editedition
if !_el!==3 goto :oe_removeedition if !_el!==3 goto :oe_removeedition
if !_el!==2 set change=0& goto :oe_edition if !_el!==2 set change=0& goto :oe_edition
if !_el!==1 set change=1& goto :oe_edition if !_el!==1 set change=1& goto :oe_edition
@ -9504,12 +9497,7 @@ goto :oe_goback
cls cls
if not defined terminal mode 76, 25 if not defined terminal mode 76, 25
if %change%==1 ( title Change Office Edition %masver%
title Change all editions %masver%
) else (
title Add edition %masver%
)
echo: echo:
echo: echo:
echo: echo:
@ -9601,8 +9589,6 @@ if %verified%==0 goto :oe_editionchange
:: Set app exclusions :: Set app exclusions
:oe_excludeappspre
cls cls
set suites= set suites=
echo %list% | find /i "Suites" %nul1% && ( echo %list% | find /i "Suites" %nul1% && (
@ -9674,7 +9660,7 @@ echo:
call :dk_color %_Green% "Choose a menu option using your keyboard:" call :dk_color %_Green% "Choose a menu option using your keyboard:"
choice /C:AENOPJRVWLDT10 /N choice /C:AENOPJRVWLDT10 /N
set _el=!errorlevel! set _el=!errorlevel!
if !_el!==14 goto :oemenu if !_el!==14 goto :oe_editionchangepre
if !_el!==13 call :excludelist & goto :oe_editionchangefinal if !_el!==13 call :excludelist & goto :oe_editionchangefinal
if !_el!==12 if defined Teams_st (if "%Teams_st%"=="Off" (set Teams_st=ON) else (set Teams_st=Off)) if !_el!==12 if defined Teams_st (if "%Teams_st%"=="Off" (set Teams_st=ON) else (set Teams_st=Off))
if !_el!==11 if defined OneDrive_st (if "%OneDrive_st%"=="Off" (set OneDrive_st=ON) else (set OneDrive_st=Off)) if !_el!==11 if defined OneDrive_st (if "%OneDrive_st%"=="Off" (set OneDrive_st=ON) else (set OneDrive_st=Off))
@ -9694,18 +9680,18 @@ goto :oe_excludeapps
set excludelist= set excludelist=
for %%# in ( for %%# in (
access Access
excel Excel
onenote OneNote
outlook Outlook
powerpoint PowerPoint
project Project
publisher Publisher
visio Visio
word Word
lync Lync
onedrive OneDrive
teams Teams
) do ( ) do (
if /i "!%%#_st!"=="Off" if defined excludelist (set excludelist=!excludelist!,%%#) else (set excludelist=,%%#) if /i "!%%#_st!"=="Off" if defined excludelist (set excludelist=!excludelist!,%%#) else (set excludelist=,%%#)
) )
@ -9776,7 +9762,7 @@ goto :oe_goback
:: OfficeClickToRun.exe with productstoadd method is used here to add editions :: OfficeClickToRun.exe with productstoadd method is used here to add editions
:: It uses delta updates, meaning that since it's using same installed build, it will consume very less Internet :: It uses delta updates, meaning that since it's using same installed build, it will consume very less Internet
set "c2rcommand="%_c2rExe%" platform=%_oArch% culture=%_lang% productstoadd=%targetedition%.16_%_lang%_x-none cdnbaseurl.16=http://officecdn.microsoft.com/pr/%_updch% baseurl.16=http://officecdn.microsoft.com/pr/%_updch% version.16=%_version% mediatype.16=CDN sourcetype.16=CDN deliverymechanism=%_updch% %targetedition%.excludedapps.16=groove%excludelist% flt.useteamsaddon=disabled flt.usebingaddononinstall=disabled flt.usebingaddononupdate=disabled" set "c2rcommand="%_c2rExe%" platform=%_oArch% culture=%_lang% productstoadd=%targetedition%.16_%_lang%_x-none cdnbaseurl.16=http://officecdn.microsoft.com/pr/%_updch% baseurl.16=http://officecdn.microsoft.com/pr/%_updch% version.16=%_version% mediatype.16=CDN sourcetype.16=CDN deliverymechanism=%_updch% %targetedition%.excludedapps.16=Groove%excludelist% flt.useteamsaddon=disabled flt.usebingaddononinstall=disabled flt.usebingaddononupdate=disabled"
if %change%==1 ( if %change%==1 (
set "c2rcommand=!c2rcommand! productstoremove=AllProducts" set "c2rcommand=!c2rcommand! productstoremove=AllProducts"
@ -9803,71 +9789,10 @@ goto :oe_goback
::======================================================================================================================================== ::========================================================================================================================================
:: Edit Office edition
:oe_editedition
cls
title Add/Remove Apps %masver%
call :oe_chkinternet
if not defined _int (
goto :oe_goback
)
set change=0
call :ch_getinfo
cls
if not defined terminal (
mode 98, 35
)
set inpt=
set counter=0
set verified=0
set targetedition=
%line%
echo:
call :dk_color %Gray% "You can edit [add/remove apps] one of the following Office editions."
%line%
echo:
for %%A in (%_oIds%) do (
set /a counter+=1
echo [!counter!] %%A
set targetedition!counter!=%%A
)
%line%
echo:
echo [0] Go Back
echo:
call :dk_color %_Green% "Enter an option number using your keyboard and press Enter to confirm:"
set /p inpt=
if "%inpt%"=="" goto :oe_editedition
if "%inpt%"=="0" goto :oemenu
for /l %%i in (1,1,%counter%) do (if "%inpt%"=="%%i" set verified=1)
set targetedition=!targetedition%inpt%!
if %verified%==0 goto :oe_editedition
::===============
cls
if not defined terminal mode 98, 32
echo %targetedition% | findstr /i "Access Excel OneNote Outlook PowerPoint Project Publisher Skype Visio Word" %nul% && (set list=SingleApps) || (set list=Suites)
goto :oe_excludeappspre
::========================================================================================================================================
:: Remove Office editions :: Remove Office editions
:oe_removeedition :oe_removeedition
title Remove Office editions %masver%
call :ch_getinfo call :ch_getinfo
cls cls
@ -9949,7 +9874,6 @@ goto :oe_goback
:oe_changeupdchnl :oe_changeupdchnl
title Change Office update channel %masver%
call :ch_getinfo call :ch_getinfo
cls cls
@ -10006,10 +9930,10 @@ for /f "tokens=1-2 delims=_" %%A in ("%%~#") do (
set supported= set supported=
if %winbuild% LSS 10240 (echo %%B | findstr /i "LTSC DevMain" %nul% || set supported=1) else (set supported=1) if %winbuild% LSS 10240 (echo %%B | findstr /i "LTSC DevMain" %nul% || set supported=1) else (set supported=1)
if %winbuild% GEQ 10240 ( if %winbuild% GEQ 10240 (
if defined ltsc19 echo %%B | find /i "2019 VL" %nul% || set supported= if defined ltsc19 echo %%A | findstr /i "2019 VL" %nul% || set supported=
if defined ltsc21 echo %%B | find /i "2021 VL" %nul% || set supported= if defined ltsc21 echo %%A | findstr /i "2021 VL" %nul% || set supported=
if defined ltsc24 echo %%B | find /i "2024 VL" %nul% || set supported= if defined ltsc24 echo %%A | findstr /i "2024 VL" %nul% || set supported=
if not defined ltscfound echo %%B | find /i "LTSC" %nul% && set supported= if not defined ltscfound echo %%B | findstr /i "LTSC" %nul% && set supported=
) )
if defined supported ( if defined supported (
set /a counter+=1 set /a counter+=1

4
MAS/Separate-Files-Version/Activators/HWID_Activation.cmd
View File

@ -1346,11 +1346,7 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" ( if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && ( sc query wlms | find /i "RUNNING" %nul% && (
if %winbuild% LSS 9200 (
echo Checking Eval WLMS Service [Found] echo Checking Eval WLMS Service [Found]
) else (
call :dk_color %Red% "Checking Eval WLMS Service [Found]"
)
) )
) )

4
MAS/Separate-Files-Version/Activators/KMS38_Activation.cmd
View File

@ -1500,11 +1500,7 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" ( if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && ( sc query wlms | find /i "RUNNING" %nul% && (
if %winbuild% LSS 9200 (
echo Checking Eval WLMS Service [Found] echo Checking Eval WLMS Service [Found]
) else (
call :dk_color %Red% "Checking Eval WLMS Service [Found]"
)
) )
) )

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

@ -350,7 +350,7 @@ cls
if not defined terminal ( if not defined terminal (
mode 130, 32 mode 130, 32
if exist "%SysPath%\spp\store_test\" mode 134, 32 if exist "%SysPath%\spp\store_test\" mode 134, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Ohook Activation %masver% title Ohook Activation %masver%
@ -1800,11 +1800,7 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" ( if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && ( sc query wlms | find /i "RUNNING" %nul% && (
if %winbuild% LSS 9200 (
echo Checking Eval WLMS Service [Found] echo Checking Eval WLMS Service [Found]
) else (
call :dk_color %Red% "Checking Eval WLMS Service [Found]"
)
) )
) )

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

@ -410,7 +410,7 @@ cls
if not defined terminal ( if not defined terminal (
mode 115, 32 mode 115, 32
if exist "%SysPath%\spp\store_test\" mode 135, 32 if exist "%SysPath%\spp\store_test\" mode 135, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=32;$B.Height=300;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Online %KS% Activation %masver% title Online %KS% Activation %masver%
@ -2849,11 +2849,7 @@ call :dk_color2 %Red% "Checking ClipSVC " %Blue% "[System
if exist "%SysPath%\wlms\wlms.exe" ( if exist "%SysPath%\wlms\wlms.exe" (
sc query wlms | find /i "RUNNING" %nul% && ( sc query wlms | find /i "RUNNING" %nul% && (
if %winbuild% LSS 9200 (
echo Checking Eval WLMS Service [Found] echo Checking Eval WLMS Service [Found]
) else (
call :dk_color %Red% "Checking Eval WLMS Service [Found]"
)
) )
) )

126
MAS/Separate-Files-Version/Change_Office_Edition.cmd
View File

@ -421,23 +421,20 @@ echo:
echo: echo:
echo ____________________________________________________________ echo ____________________________________________________________
echo: echo:
echo [1] Change all editions echo [1] Change - Office Edition
echo [2] Add edition echo [2] Add - Office Edition
echo [3] Remove edition echo [3] Remove - Office Edition
echo:
echo [4] Add/Remove apps
echo ____________________________________________ echo ____________________________________________
echo: echo:
echo [5] Change Office Update Channel echo [4] Change Office Update Channel
echo [0] %_exitmsg% echo [0] %_exitmsg%
echo ____________________________________________________________ echo ____________________________________________________________
echo: echo:
call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard [1,2,3,4,5,0]" call :dk_color2 %_White% " " %_Green% "Choose a menu option using your keyboard [1,2,3,4,0]"
choice /C:123450 /N choice /C:12340 /N
set _el=!errorlevel! set _el=!errorlevel!
if !_el!==6 exit /b if !_el!==5 exit /b
if !_el!==5 goto :oe_changeupdchnl if !_el!==4 goto :oe_changeupdchnl
if !_el!==4 goto :oe_editedition
if !_el!==3 goto :oe_removeedition if !_el!==3 goto :oe_removeedition
if !_el!==2 set change=0& goto :oe_edition if !_el!==2 set change=0& goto :oe_edition
if !_el!==1 set change=1& goto :oe_edition if !_el!==1 set change=1& goto :oe_edition
@ -455,12 +452,7 @@ goto :oe_goback
cls cls
if not defined terminal mode 76, 25 if not defined terminal mode 76, 25
if %change%==1 ( title Change Office Edition %masver%
title Change all editions %masver%
) else (
title Add edition %masver%
)
echo: echo:
echo: echo:
echo: echo:
@ -552,8 +544,6 @@ if %verified%==0 goto :oe_editionchange
:: Set app exclusions :: Set app exclusions
:oe_excludeappspre
cls cls
set suites= set suites=
echo %list% | find /i "Suites" %nul1% && ( echo %list% | find /i "Suites" %nul1% && (
@ -625,7 +615,7 @@ echo:
call :dk_color %_Green% "Choose a menu option using your keyboard:" call :dk_color %_Green% "Choose a menu option using your keyboard:"
choice /C:AENOPJRVWLDT10 /N choice /C:AENOPJRVWLDT10 /N
set _el=!errorlevel! set _el=!errorlevel!
if !_el!==14 goto :oemenu if !_el!==14 goto :oe_editionchangepre
if !_el!==13 call :excludelist & goto :oe_editionchangefinal if !_el!==13 call :excludelist & goto :oe_editionchangefinal
if !_el!==12 if defined Teams_st (if "%Teams_st%"=="Off" (set Teams_st=ON) else (set Teams_st=Off)) if !_el!==12 if defined Teams_st (if "%Teams_st%"=="Off" (set Teams_st=ON) else (set Teams_st=Off))
if !_el!==11 if defined OneDrive_st (if "%OneDrive_st%"=="Off" (set OneDrive_st=ON) else (set OneDrive_st=Off)) if !_el!==11 if defined OneDrive_st (if "%OneDrive_st%"=="Off" (set OneDrive_st=ON) else (set OneDrive_st=Off))
@ -645,18 +635,18 @@ goto :oe_excludeapps
set excludelist= set excludelist=
for %%# in ( for %%# in (
access Access
excel Excel
onenote OneNote
outlook Outlook
powerpoint PowerPoint
project Project
publisher Publisher
visio Visio
word Word
lync Lync
onedrive OneDrive
teams Teams
) do ( ) do (
if /i "!%%#_st!"=="Off" if defined excludelist (set excludelist=!excludelist!,%%#) else (set excludelist=,%%#) if /i "!%%#_st!"=="Off" if defined excludelist (set excludelist=!excludelist!,%%#) else (set excludelist=,%%#)
) )
@ -727,7 +717,7 @@ goto :oe_goback
:: OfficeClickToRun.exe with productstoadd method is used here to add editions :: OfficeClickToRun.exe with productstoadd method is used here to add editions
:: It uses delta updates, meaning that since it's using same installed build, it will consume very less Internet :: It uses delta updates, meaning that since it's using same installed build, it will consume very less Internet
set "c2rcommand="%_c2rExe%" platform=%_oArch% culture=%_lang% productstoadd=%targetedition%.16_%_lang%_x-none cdnbaseurl.16=http://officecdn.microsoft.com/pr/%_updch% baseurl.16=http://officecdn.microsoft.com/pr/%_updch% version.16=%_version% mediatype.16=CDN sourcetype.16=CDN deliverymechanism=%_updch% %targetedition%.excludedapps.16=groove%excludelist% flt.useteamsaddon=disabled flt.usebingaddononinstall=disabled flt.usebingaddononupdate=disabled" set "c2rcommand="%_c2rExe%" platform=%_oArch% culture=%_lang% productstoadd=%targetedition%.16_%_lang%_x-none cdnbaseurl.16=http://officecdn.microsoft.com/pr/%_updch% baseurl.16=http://officecdn.microsoft.com/pr/%_updch% version.16=%_version% mediatype.16=CDN sourcetype.16=CDN deliverymechanism=%_updch% %targetedition%.excludedapps.16=Groove%excludelist% flt.useteamsaddon=disabled flt.usebingaddononinstall=disabled flt.usebingaddononupdate=disabled"
if %change%==1 ( if %change%==1 (
set "c2rcommand=!c2rcommand! productstoremove=AllProducts" set "c2rcommand=!c2rcommand! productstoremove=AllProducts"
@ -754,71 +744,10 @@ goto :oe_goback
::======================================================================================================================================== ::========================================================================================================================================
:: Edit Office edition
:oe_editedition
cls
title Add/Remove Apps %masver%
call :oe_chkinternet
if not defined _int (
goto :oe_goback
)
set change=0
call :ch_getinfo
cls
if not defined terminal (
mode 98, 35
)
set inpt=
set counter=0
set verified=0
set targetedition=
%line%
echo:
call :dk_color %Gray% "You can edit [add/remove apps] one of the following Office editions."
%line%
echo:
for %%A in (%_oIds%) do (
set /a counter+=1
echo [!counter!] %%A
set targetedition!counter!=%%A
)
%line%
echo:
echo [0] Go Back
echo:
call :dk_color %_Green% "Enter an option number using your keyboard and press Enter to confirm:"
set /p inpt=
if "%inpt%"=="" goto :oe_editedition
if "%inpt%"=="0" goto :oemenu
for /l %%i in (1,1,%counter%) do (if "%inpt%"=="%%i" set verified=1)
set targetedition=!targetedition%inpt%!
if %verified%==0 goto :oe_editedition
::===============
cls
if not defined terminal mode 98, 32
echo %targetedition% | findstr /i "Access Excel OneNote Outlook PowerPoint Project Publisher Skype Visio Word" %nul% && (set list=SingleApps) || (set list=Suites)
goto :oe_excludeappspre
::========================================================================================================================================
:: Remove Office editions :: Remove Office editions
:oe_removeedition :oe_removeedition
title Remove Office editions %masver%
call :ch_getinfo call :ch_getinfo
cls cls
@ -900,7 +829,6 @@ goto :oe_goback
:oe_changeupdchnl :oe_changeupdchnl
title Change Office update channel %masver%
call :ch_getinfo call :ch_getinfo
cls cls
@ -957,10 +885,10 @@ for /f "tokens=1-2 delims=_" %%A in ("%%~#") do (
set supported= set supported=
if %winbuild% LSS 10240 (echo %%B | findstr /i "LTSC DevMain" %nul% || set supported=1) else (set supported=1) if %winbuild% LSS 10240 (echo %%B | findstr /i "LTSC DevMain" %nul% || set supported=1) else (set supported=1)
if %winbuild% GEQ 10240 ( if %winbuild% GEQ 10240 (
if defined ltsc19 echo %%B | find /i "2019 VL" %nul% || set supported= if defined ltsc19 echo %%A | findstr /i "2019 VL" %nul% || set supported=
if defined ltsc21 echo %%B | find /i "2021 VL" %nul% || set supported= if defined ltsc21 echo %%A | findstr /i "2021 VL" %nul% || set supported=
if defined ltsc24 echo %%B | find /i "2024 VL" %nul% || set supported= if defined ltsc24 echo %%A | findstr /i "2024 VL" %nul% || set supported=
if not defined ltscfound echo %%B | find /i "LTSC" %nul% && set supported= if not defined ltscfound echo %%B | findstr /i "LTSC" %nul% && set supported=
) )
if defined supported ( if defined supported (
set /a counter+=1 set /a counter+=1

4
MAS/Separate-Files-Version/Change_Windows_Edition.cmd
View File

@ -605,7 +605,7 @@ goto dk_done
cls cls
if not defined terminal ( if not defined terminal (
mode con cols=105 lines=32 mode con cols=105 lines=32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
call :ced_rebootflag call :ced_rebootflag
@ -642,7 +642,7 @@ goto dk_done
cls cls
if not defined terminal ( if not defined terminal (
mode con cols=105 lines=32 mode con cols=105 lines=32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
set key= set key=

2
MAS/Separate-Files-Version/Troubleshoot.cmd
View File

@ -461,7 +461,7 @@ goto :at_back
cls cls
if not defined terminal ( if not defined terminal (
mode 125, 32 mode 125, 32
%psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}" %nul% %psc% "&{$W=$Host.UI.RawUI.WindowSize;$B=$Host.UI.RawUI.BufferSize;$W.Height=31;$B.Height=200;$Host.UI.RawUI.WindowSize=$W;$Host.UI.RawUI.BufferSize=$B;}"
) )
title Fix Licensing ^(ClipSVC ^+ SPP ^+ OSPP^) title Fix Licensing ^(ClipSVC ^+ SPP ^+ OSPP^)