From 4fdefbc0d58befbe824440af39ed424c6386f65f Mon Sep 17 00:00:00 2001 From: Lyssa Date: Wed, 28 Jan 2026 17:58:08 +0400 Subject: Remove some more empty lines --- MAS/All-In-One-Version-KL/MAS_AIO.cmd | 35 ---------------------- .../Activators/HWID_Activation.cmd | 16 ---------- .../Activators/Ohook_Activation_AIO.cmd | 15 ---------- .../Activators/Online_KMS_Activation.cmd | 13 -------- .../Activators/TSforge_Activation.cmd | 16 ---------- .../Change_Office_Edition.cmd | 12 -------- .../Change_Windows_Edition.cmd | 9 ------ MAS/Separate-Files-Version/Extract_OEM_Folder.cmd | 5 ---- MAS/Separate-Files-Version/Troubleshoot.cmd | 5 ---- 9 files changed, 126 deletions(-) diff --git a/MAS/All-In-One-Version-KL/MAS_AIO.cmd b/MAS/All-In-One-Version-KL/MAS_AIO.cmd index 732af69..3020c5c 100644 --- a/MAS/All-In-One-Version-KL/MAS_AIO.cmd +++ b/MAS/All-In-One-Version-KL/MAS_AIO.cmd @@ -239,7 +239,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -249,7 +248,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -260,7 +258,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -272,7 +269,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -293,7 +289,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -716,7 +711,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -763,7 +757,6 @@ echo [%winos% ^| %winbuild%] echo: echo Evaluation editions cannot be activated outside of their evaluation period. call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period." -echo: set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" goto dk_done @@ -1035,7 +1028,6 @@ licensing.mp.microsoft.com findstr /i "%%#" "%SysPath%\drivers\etc\hosts" %nul1% && set "hosfail= [%%# Blocked in Hosts]" ) call :dk_color %Red% "Checking Licensing Servers [Failed to Connect]!hosfail!" -echo: set fixes=%fixes% %mas%licensing-servers-issue call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%licensing-servers-issue" echo: @@ -1076,7 +1068,6 @@ set error=1 call :dk_color %Red% "Checking Windows Update Registry [Corruption Found]" if !wcount! GTR 2 ( call :dk_color %Red% "Windows seems to be infected with Mal%w%ware." -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -1105,7 +1096,6 @@ if %keyerror% EQU 0 if not defined _perm if defined _int ( if not defined wucorrupt if not defined wublock if not defined wuerror if not defined storeblock if not defined resfail ( echo "%error_code%" | findstr /i "0x80072e 0x80072f 0x800704cf 0x87e10bcf 0x800705b4" %nul% && ( call :dk_color %Red% "Checking Internet Issues [Found] %error_code%" -echo: set fixes=%fixes% %mas%licensing-servers-issue call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%licensing-servers-issue" echo: @@ -1539,7 +1529,6 @@ if not "%results%%pupfound%"=="" ( if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]" if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..." if defined results (call :dk_color %Red% "%results%"&set showfix=1) -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -1622,7 +1611,6 @@ set showfix=1 ) echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && ( if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If the activation fails, do this - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1793,7 +1781,6 @@ set showfix=1 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || ( call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]" if not defined showfix ( -echo: set fixes=%fixes% %mas%issues_due_to_gaming_spoofers call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers" echo: @@ -1814,7 +1801,6 @@ if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\Net if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" ( call :dk_color %Red% "Checking TokenStore Registry Key [Correct Path Not Found] [!tokenstore!]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1845,7 +1831,6 @@ call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creat ) else ( call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2035,7 +2020,6 @@ set showfix=1 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || ( call :dk_color %Red% "Checking HKU\S-1-5-20 Registry [Not Found]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2160,7 +2144,6 @@ if "!taskinfo!"=="" set "taskinfo=Not Found" call :dk_color %Gray% "Checking SvcRestartTask Status [!taskinfo!. System might deactivate later.]" if not defined showfix ( -echo: echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && ( set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" @@ -2556,7 +2539,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -2660,7 +2642,6 @@ echo: echo You only have the Office Dashboard app installed; you need to install the full version of Office. ) call :dk_color %Blue% "Download and install Office from the URL below, then try again." -echo: set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto dk_done @@ -2875,7 +2856,6 @@ echo Help: %mas%troubleshoot ) else ( call :dk_color %Red% "Some errors were detected." if not defined ierror if not defined showfix call :dk_color %Blue% "%_fixmsg%" -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" ) @@ -4543,7 +4523,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -4557,7 +4536,6 @@ echo .NET 3.5 Framework is corrupt or missing. Aborting... if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-Embedded" ( echo Install .NET Framework 4.8 and Windows Management Framework 5.1 ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -4571,7 +4549,6 @@ if !errorlevel! EQU 1051 ( %eline% echo Evaluation WLMS service is running, %_slser% service can not be stopped. Aborting... echo Install Non-Eval version for Windows build %winbuild%. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -12217,7 +12194,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -17228,7 +17204,6 @@ if not exist %SysPath%\%%# ( echo [%SysPath%\%%#] file is missing, aborting... call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -17446,7 +17421,6 @@ if not defined key ( %eline% echo [%targetedition% ^| %winbuild%] echo Failed to get product key from pkeyhelper.dll. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -17501,7 +17475,6 @@ echo: call :dk_color %Gray% "Reboot is required to fully change the edition." ) else ( call :dk_color %Red% "[Unsuccessful] [Error Code: !keyerror!]" -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" ) @@ -17582,7 +17555,6 @@ if not defined key ( %eline% echo [%targetedition% ^| %winbuild%] echo Failed to get product key from pkeyhelper.dll. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -18136,7 +18108,6 @@ if not defined o16c2r_reg ( %eline% echo Office C2R 2016 or later is not installed, which is required for this script. echo Download and install Office from below URL and try again. -echo: set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto dk_done @@ -18187,7 +18158,6 @@ if %winbuild% LSS 10240 if defined ltscfound ( echo Installed Office appears to be from the Volume channel %ltsc19%%ltsc21%%ltsc24%, echo which is not officially supported on your Windows build version %winbuild%. echo Aborting... -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -18201,7 +18171,6 @@ if defined unsupbuild ( %eline% echo Unsupported Office %verchk% is installed on your Windows build version %winbuild%. echo Aborting... -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -18308,7 +18277,6 @@ mode 98, 45 if not exist %SystemRoot%\Temp\%list%.txt ( %eline% echo Failed to generate available editions list. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -18373,7 +18341,6 @@ set suites=1 if not exist %SystemRoot%\Temp\getAppIds.txt ( %eline% echo Failed to generate available apps list. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -18892,7 +18859,6 @@ goto :oe_goback if not defined build ( %eline% call :dk_color %Red% "Failed to detect build number for the target FFN." -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -18930,7 +18896,6 @@ for /l %%i in (1,1,30) do (if !clverchk! LSS %buildchk% (call :ch_getinfo&timeou if %clverchk% LSS %buildchk% ( echo: call :dk_color %Red% "Failed to update Office C2R client. Aborting..." -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback diff --git a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd index 242beb5..ce4470b 100644 --- a/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/HWID_Activation.cmd @@ -260,7 +260,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -270,7 +269,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -281,7 +279,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -293,7 +290,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -314,7 +310,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -425,7 +420,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -472,7 +466,6 @@ echo [%winos% ^| %winbuild%] echo: echo Evaluation editions cannot be activated outside of their evaluation period. call :dk_color %Blue% "Use TSforge activation option from the main menu to reset evaluation period." -echo: set fixes=%fixes% %mas%evaluation_editions call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%evaluation_editions" goto dk_done @@ -744,7 +737,6 @@ licensing.mp.microsoft.com findstr /i "%%#" "%SysPath%\drivers\etc\hosts" %nul1% && set "hosfail= [%%# Blocked in Hosts]" ) call :dk_color %Red% "Checking Licensing Servers [Failed to Connect]!hosfail!" -echo: set fixes=%fixes% %mas%licensing-servers-issue call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%licensing-servers-issue" echo: @@ -813,7 +805,6 @@ if %keyerror% EQU 0 if not defined _perm if defined _int ( if not defined wucorrupt if not defined wublock if not defined wuerror if not defined storeblock if not defined resfail ( echo "%error_code%" | findstr /i "0x80072e 0x80072f 0x800704cf 0x87e10bcf 0x800705b4" %nul% && ( call :dk_color %Red% "Checking Internet Issues [Found] %error_code%" -echo: set fixes=%fixes% %mas%licensing-servers-issue call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%licensing-servers-issue" echo: @@ -1231,7 +1222,6 @@ if not "%results%%pupfound%"=="" ( if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]" if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..." if defined results (call :dk_color %Red% "%results%"&set showfix=1) -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -1314,7 +1304,6 @@ set showfix=1 ) echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && ( if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If the activation fails, do this - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1485,7 +1474,6 @@ set showfix=1 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || ( call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]" if not defined showfix ( -echo: set fixes=%fixes% %mas%issues_due_to_gaming_spoofers call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers" echo: @@ -1506,7 +1494,6 @@ if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\Net if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" ( call :dk_color %Red% "Checking TokenStore Registry Key [Correct Path Not Found] [!tokenstore!]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1537,7 +1524,6 @@ call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creat ) else ( call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1727,7 +1713,6 @@ set showfix=1 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || ( call :dk_color %Red% "Checking HKU\S-1-5-20 Registry [Not Found]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -1852,7 +1837,6 @@ if "!taskinfo!"=="" set "taskinfo=Not Found" call :dk_color %Gray% "Checking SvcRestartTask Status [!taskinfo!. System might deactivate later.]" if not defined showfix ( -echo: echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && ( set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" diff --git a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd index ad442c4..779f645 100644 --- a/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd +++ b/MAS/Separate-Files-Version/Activators/Ohook_Activation_AIO.cmd @@ -269,7 +269,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -279,7 +278,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -290,7 +288,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -302,7 +299,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -323,7 +319,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -471,7 +466,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -573,7 +567,6 @@ echo: echo You only have the Office Dashboard app installed; you need to install the full version of Office. ) call :dk_color %Blue% "Download and install Office from the URL below, then try again." -echo: set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto dk_done @@ -788,7 +781,6 @@ echo Help: %mas%troubleshoot ) else ( call :dk_color %Red% "Some errors were detected." if not defined ierror if not defined showfix call :dk_color %Blue% "%_fixmsg%" -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" ) @@ -1941,7 +1933,6 @@ if not "%results%%pupfound%"=="" ( if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]" if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..." if defined results (call :dk_color %Red% "%results%"&set showfix=1) -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -2024,7 +2015,6 @@ set showfix=1 ) echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && ( if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If the activation fails, do this - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2195,7 +2185,6 @@ set showfix=1 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || ( call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]" if not defined showfix ( -echo: set fixes=%fixes% %mas%issues_due_to_gaming_spoofers call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers" echo: @@ -2216,7 +2205,6 @@ if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\Net if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" ( call :dk_color %Red% "Checking TokenStore Registry Key [Correct Path Not Found] [!tokenstore!]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2247,7 +2235,6 @@ call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creat ) else ( call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2437,7 +2424,6 @@ set showfix=1 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || ( call :dk_color %Red% "Checking HKU\S-1-5-20 Registry [Not Found]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -2562,7 +2548,6 @@ if "!taskinfo!"=="" set "taskinfo=Not Found" call :dk_color %Gray% "Checking SvcRestartTask Status [!taskinfo!. System might deactivate later.]" if not defined showfix ( -echo: echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && ( set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" diff --git a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd index dbc1082..3ce8fa8 100644 --- a/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/Online_KMS_Activation.cmd @@ -300,7 +300,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -310,7 +309,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -321,7 +319,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -333,7 +330,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -354,7 +350,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -534,7 +529,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -2983,7 +2977,6 @@ if not "%results%%pupfound%"=="" ( if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]" if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..." if defined results (call :dk_color %Red% "%results%"&set showfix=1) -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -3066,7 +3059,6 @@ set showfix=1 ) echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && ( if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If the activation fails, do this - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3237,7 +3229,6 @@ set showfix=1 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || ( call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]" if not defined showfix ( -echo: set fixes=%fixes% %mas%issues_due_to_gaming_spoofers call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers" echo: @@ -3258,7 +3249,6 @@ if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\Net if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" ( call :dk_color %Red% "Checking TokenStore Registry Key [Correct Path Not Found] [!tokenstore!]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3289,7 +3279,6 @@ call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creat ) else ( call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3479,7 +3468,6 @@ set showfix=1 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || ( call :dk_color %Red% "Checking HKU\S-1-5-20 Registry [Not Found]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3604,7 +3592,6 @@ if "!taskinfo!"=="" set "taskinfo=Not Found" call :dk_color %Gray% "Checking SvcRestartTask Status [!taskinfo!. System might deactivate later.]" if not defined showfix ( -echo: echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && ( set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" diff --git a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd index 4b43e3f..4e29ea3 100644 --- a/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd +++ b/MAS/Separate-Files-Version/Activators/TSforge_Activation.cmd @@ -212,7 +212,6 @@ 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% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" @@ -327,7 +326,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -337,7 +335,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -348,7 +345,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -360,7 +356,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -381,7 +376,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -604,7 +598,6 @@ echo: if not defined results ( call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" ) @@ -618,7 +611,6 @@ echo .NET 3.5 Framework is corrupt or missing. Aborting... if exist "%SysPath%\spp\tokens\skus\Security-SPP-Component-SKU-Embedded" ( echo Install .NET Framework 4.8 and Windows Management Framework 5.1 ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -632,7 +624,6 @@ if !errorlevel! EQU 1051 ( %eline% echo Evaluation WLMS service is running, %_slser% service can not be stopped. Aborting... echo Install Non-Eval version for Windows build %winbuild%. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -2999,7 +2990,6 @@ if not "%results%%pupfound%"=="" ( if defined pupfound call :dk_color %Gray% "Checking PUP Activators [Found%pupfound%]" if defined results call :dk_color %Red% "Checking Probable Mal%w%ware Infection..." if defined results (call :dk_color %Red% "%results%"&set showfix=1) -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" echo: @@ -3082,7 +3072,6 @@ set showfix=1 ) echo "%imagestate%" | find /i "UNDEPLOYABLE" %nul% && ( if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If the activation fails, do this - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3253,7 +3242,6 @@ set showfix=1 if %winbuild% GEQ 7600 reg query "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\SoftwareProtectionPlatform\Plugins\Objects\msft:rm/algorithm/hwid/4.0" /f ba02fed39662 /d %nul% || ( call :dk_color %Red% "Checking SPP Registry Key [Incorrect ModuleId Found] [Most likely caused by gaming spoofers]" if not defined showfix ( -echo: set fixes=%fixes% %mas%issues_due_to_gaming_spoofers call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%issues_due_to_gaming_spoofers" echo: @@ -3274,7 +3262,6 @@ if %winbuild% LSS 9200 set "tokenstore=%Systemdrive%\Windows\ServiceProfiles\Net if %winbuild% GEQ 9200 if /i not "!tokenstore!"=="%SysPath%\spp\store" if /i not "!tokenstore!"=="%SysPath%\spp\store\2.0" if /i not "!tokenstore!"=="%SysPath%\spp\store_test\2.0" ( call :dk_color %Red% "Checking TokenStore Registry Key [Correct Path Not Found] [!tokenstore!]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3305,7 +3292,6 @@ call :dk_color %Gray% "Checking SPP Token Folder [Not Found, Creat ) else ( call :dk_color %Red% "Checking SPP Token Folder [Not Found, Failed to Create] [%tokenstore%\]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3495,7 +3481,6 @@ set showfix=1 reg query "HKU\S-1-5-20\Software\Microsoft\Windows NT\CurrentVersion" %nul% || ( call :dk_color %Red% "Checking HKU\S-1-5-20 Registry [Not Found]" if not defined showfix ( -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" echo: @@ -3620,7 +3605,6 @@ if "!taskinfo!"=="" set "taskinfo=Not Found" call :dk_color %Gray% "Checking SvcRestartTask Status [!taskinfo!. System might deactivate later.]" if not defined showfix ( -echo: echo "!taskinfo!" | findstr /i "Removed Not Found" %nul1% && ( set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" diff --git a/MAS/Separate-Files-Version/Change_Office_Edition.cmd b/MAS/Separate-Files-Version/Change_Office_Edition.cmd index b35aaf0..fad2060 100644 --- a/MAS/Separate-Files-Version/Change_Office_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Office_Edition.cmd @@ -214,7 +214,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -224,7 +223,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -235,7 +233,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -247,7 +244,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -268,7 +264,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -416,7 +411,6 @@ if not defined o16c2r_reg ( %eline% echo Office C2R 2016 or later is not installed, which is required for this script. echo Download and install Office from below URL and try again. -echo: set fixes=%fixes% %mas%genuine-installation-media call :dk_color %_Yellow% "%mas%genuine-installation-media" goto dk_done @@ -467,7 +461,6 @@ if %winbuild% LSS 10240 if defined ltscfound ( echo Installed Office appears to be from the Volume channel %ltsc19%%ltsc21%%ltsc24%, echo which is not officially supported on your Windows build version %winbuild%. echo Aborting... -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -481,7 +474,6 @@ if defined unsupbuild ( %eline% echo Unsupported Office %verchk% is installed on your Windows build version %winbuild%. echo Aborting... -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -588,7 +580,6 @@ mode 98, 45 if not exist %SystemRoot%\Temp\%list%.txt ( %eline% echo Failed to generate available editions list. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -653,7 +644,6 @@ set suites=1 if not exist %SystemRoot%\Temp\getAppIds.txt ( %eline% echo Failed to generate available apps list. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -1172,7 +1162,6 @@ goto :oe_goback if not defined build ( %eline% call :dk_color %Red% "Failed to detect build number for the target FFN." -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback @@ -1210,7 +1199,6 @@ for /l %%i in (1,1,30) do (if !clverchk! LSS %buildchk% (call :ch_getinfo&timeou if %clverchk% LSS %buildchk% ( echo: call :dk_color %Red% "Failed to update Office C2R client. Aborting..." -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto :oe_goback diff --git a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd index 7469069..4d758ec 100644 --- a/MAS/Separate-Files-Version/Change_Windows_Edition.cmd +++ b/MAS/Separate-Files-Version/Change_Windows_Edition.cmd @@ -219,7 +219,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -229,7 +228,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -240,7 +238,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -252,7 +249,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -273,7 +269,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -397,7 +392,6 @@ if not exist %SysPath%\%%# ( echo [%SysPath%\%%#] file is missing, aborting... call :dk_color %Blue% "Go back to Main Menu, select Troubleshoot and run DISM Restore and SFC Scan options." call :dk_color %Blue% "After that, restart system and try activation again." -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "If it still shows the same error, do this - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -615,7 +609,6 @@ if not defined key ( %eline% echo [%targetedition% ^| %winbuild%] echo Failed to get product key from pkeyhelper.dll. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done @@ -670,7 +663,6 @@ echo: call :dk_color %Gray% "Reboot is required to fully change the edition." ) else ( call :dk_color %Red% "[Unsuccessful] [Error Code: !keyerror!]" -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" ) @@ -751,7 +743,6 @@ if not defined key ( %eline% echo [%targetedition% ^| %winbuild%] echo Failed to get product key from pkeyhelper.dll. -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done diff --git a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd index 1129301..2a95158 100644 --- a/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd +++ b/MAS/Separate-Files-Version/Extract_OEM_Folder.cmd @@ -230,7 +230,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto done2 @@ -240,7 +239,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto done2 @@ -251,7 +249,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto done2 @@ -263,7 +260,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto done2 @@ -284,7 +280,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto done2 diff --git a/MAS/Separate-Files-Version/Troubleshoot.cmd b/MAS/Separate-Files-Version/Troubleshoot.cmd index 2115d8b..7fcadf7 100644 --- a/MAS/Separate-Files-Version/Troubleshoot.cmd +++ b/MAS/Separate-Files-Version/Troubleshoot.cmd @@ -231,7 +231,6 @@ REM check LanguageMode echo: !tstresult2! | findstr /i "ConstrainedLanguage RestrictedLanguage NoLanguage" %nul1% && ( echo FullLanguage mode not found in PowerShell. Aborting... echo If you have applied restrictions on Powershell then undo those changes. -echo: set fixes=%fixes% %mas%fix_powershell call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%fix_powershell" goto dk_done @@ -241,7 +240,6 @@ REM check Powershell core version cmd /c "%psc% "$PSVersionTable.PSEdition"" | find /i "Core" %nul1% && ( echo Windows Powershell is needed for MAS but it seems to be replaced with Powershell core. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -252,7 +250,6 @@ REM check for Mal-ware that may cause issues with Powershell for /r "%ProgramFiles%\" %%f in (secureboot.exe) do if exist "%%f" ( echo "%%f" echo Mal%blank%ware found, PowerShell is not working properly. -echo: set fixes=%fixes% %mas%remove_mal%w%ware call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%remove_mal%w%ware" goto dk_done @@ -264,7 +261,6 @@ if /i "!tstresult2!"=="FullLanguage" ( cmd /c "%psc% ""try {[System.AppDomain]::CurrentDomain.GetAssemblies(); [System.Math]::Sqrt(144)} catch {Exit 3}""" %nul% if !errorlevel!==3 ( echo Windows Powershell failed to load .NET command. Aborting... -echo: set fixes=%fixes% %mas%in-place_repair_upgrade call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%in-place_repair_upgrade" goto dk_done @@ -285,7 +281,6 @@ echo Installed Antivirus - Microsoft Defender for Endpoint cmd /c "%psc% ""$av = Get-WmiObject -Namespace root\SecurityCenter2 -Class AntiVirusProduct; $n = @(); foreach ($i in $av) { $n += $i.displayName }; if ($n) { Write-Host ('Installed Antivirus - ' + ($n -join ', '))}""" ) -echo: set fixes=%fixes% %mas%troubleshoot call :dk_color2 %Blue% "Check this webpage for help - " %_Yellow% " %mas%troubleshoot" goto dk_done -- cgit v1.2.3