Remove some more empty lines

1 files changed, 0 insertions, 35 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